Imagecache error accessing noimage.png

I'm finding that the call to path_to_theme in theme_uc_option_image_no_image is returning the path to the module. This appears to be consistent with path_to_theme's documentation:

"If implemented from a module, it will point to the module."

(see http://api.drupal.org/api/drupal/includes--theme.inc/function/path_to_th...)

I've so far been patching it to point to the module-supplied no_image.png (see attached patch). What would probably be preferable would be to check and see if images/noimage.png exists in the current theme, use it if it is, but use the module-supplied no_image.png if it is not. Is there an equivalent to path_to_theme that give you the theme patch even if called from a module?

Note that theme_uc_option_image_no_image_path (which appears to be *supposed* to use the module-supplied no_image.png) uses noimage.png instead of no_image.png. The attached patch also fixes that.

Attached is a patch that will first check for images/noimage.png in the current theme, use it if it is there, or else use the module-supplied no_image.png.

Note that I had to use dirname($theme_info->filename) to get the directory for the current theme. Both path_to_theme and the global $theme_path variable return the path to the module when called from within the module. This is the only way I've so far found to do this.