Index: skinr.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/skinr/skinr.module,v
retrieving revision 1.13.2.9
diff -u -p -r1.13.2.9 skinr.module
--- skinr.module	12 Feb 2010 23:13:31 -0000	1.13.2.9
+++ skinr.module	18 Feb 2010 04:02:36 -0000
@@ -285,10 +285,17 @@ function skinr_preprocess(&$vars, $hook)
   $current_theme = skinr_current_theme();
   $theme_registry = theme_get_registry();
 
-  // Add any base themes.
-  $themes = array_keys(system_find_base_themes(system_theme_data(), $current_theme));
-  // Add the current theme.
-  $themes[] = $current_theme;
+  static $themes = array();
+  if (empty($themes)) {
+    // Add any base themes.
+    $theme_data = _system_theme_data();
+    // make sure the theme has a base theme
+    if (isset($theme_data[$current_theme]->base_themes) && is_array($theme_data[$current_theme]->base_themes)) {
+      $themes = array_keys($theme_data[$current_theme]->base_themes);
+    }
+    // Add the current theme.
+    $themes[] = $current_theme;
+  }
 
   $original_hook = $hook;
   if (isset($theme_registry[$hook]['original hook'])) {
@@ -350,7 +357,7 @@ function _skinr_add_file($filename, $the
   if (!is_array($themes)) {
     $themes = array($themes);
   }
-  
+
   foreach ($themes as $theme) {
     $filename = drupal_get_path('theme', $theme) .'/'. $filename;
     if (file_exists($filename)) {