- Patch #629902 by andypost, JohnAlbin, David_Rothstein: critical bug: theme_get_setting() should return NULL for features that are disabled in a theme.

1 files changed, 18 insertions, 11 deletions

diff --git a/modules/system/system.module b/modules/system/system.module
index 2154d0573..6c5cbe119 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -2316,17 +2316,7 @@ function _system_rebuild_theme_data() {
         'page_bottom' => 'Page bottom',
       ),
       'description' => '',
-      'features' => array(
-        'comment_user_picture',
-        'comment_user_verification',
-        'favicon',
-        'logo',
-        'name',
-        'node_user_picture',
-        'slogan',
-        'main_menu',
-        'secondary_menu',
-      ),
+      'features' => _system_default_theme_features(),
       'screenshot' => 'screenshot.png',
       'php' => DRUPAL_MINIMUM_PHP,
     );
@@ -2433,6 +2423,23 @@ function system_rebuild_theme_data() {
 }
 
 /**
+ * Returns an array of default theme features.
+ */
+function _system_default_theme_features() {
+  return array(
+    'logo',
+    'favicon',
+    'name',
+    'slogan',
+    'node_user_picture',
+    'comment_user_picture',
+    'comment_user_verification',
+    'main_menu',
+    'secondary_menu',
+  );
+}
+
+/**
  * Find all the base themes for the specified theme.
  *
  * Themes can inherit templates and function implementations from earlier themes.