Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.548
diff -u -p -r1.548 theme.inc
--- includes/theme.inc	5 Nov 2009 16:19:25 -0000	1.548
+++ includes/theme.inc	5 Nov 2009 21:39:19 -0000
@@ -1138,7 +1138,7 @@ function theme_get_setting($setting_name
 
   // If no key is given, use the current theme if we can determine it.
   if (is_null($theme)) {
-    $theme = !empty($GLOBALS['theme_key']) ? $GLOBALS['theme_key'] : (!empty($GLOBALS['custom_theme']) ? $GLOBALS['custom_theme'] : '');
+    $theme = !empty($GLOBALS['theme_key']) ? $GLOBALS['theme_key'] : '';
   }
 
   if (empty($cache[$theme])) {