From: JohnAlbin
Date: Mon, 21 Apr 2008 02:45:35 +0000 (+0000)
Subject: #199682: 'Submitted by' text is shown for content even if setting is disabled
X-Git-Tag: 5.x-1.1~2
X-Git-Url: http://drupalcode.org/project/zen.git/commitdiff_plain/2c47419093d6d81138c1ca1375631ffd590facc2

#199682: 'Submitted by' text is shown for content even if setting is disabled
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f93579d..a53da69 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,5 @@
 Zen 5.x-1.x-dev
+  #199682: 'Submitted by' text is shown for content even if setting is disabled
   #247960: Add THEME_preprocess() hook to Zen
   #222339: Blocks in Zen Classic header and closure lack padding
   #248720 by matt@antinomia: Only UPDATE {system} table WHERE type = 'theme'
diff --git a/STARTERKIT/theme-settings-init.php b/STARTERKIT/theme-settings-init.php
index a041cba..1ea9310 100644
--- a/STARTERKIT/theme-settings-init.php
+++ b/STARTERKIT/theme-settings-init.php
@@ -18,11 +18,19 @@ if (is_null(theme_get_setting('zen_block_editing'))) {
     'zen_wireframes' => 0,
   );
 
-  // Save default theme settings
+  // Get default theme settings.
+  $settings = theme_get_settings($theme_key);
+  // Don't save the toggle_node_info_ variables.
+  if (module_exists('node')) {
+    foreach (node_get_types() as $type => $name) {
+      unset($settings['toggle_node_info_' . $type]);
+    }
+  }
+  // Save default theme settings.
   variable_set(
     str_replace('/', '_', 'theme_'. $theme_key .'_settings'),
-    array_merge($defaults, theme_get_settings($theme_key))
+    array_merge($defaults, $settings)
   );
-  // Force refresh of Drupal internals
+  // Force refresh of Drupal internals.
   theme_get_setting('', TRUE);
 }
diff --git a/theme-settings-init.php b/theme-settings-init.php
index 2df6014..1bee79e 100644
--- a/theme-settings-init.php
+++ b/theme-settings-init.php
@@ -18,11 +18,19 @@ if (is_null(theme_get_setting('zen_block_editing'))) {
     'zen_wireframes' => 0,
   );
 
-  // Save default theme settings
+  // Get default theme settings.
+  $settings = theme_get_settings($theme_key);
+  // Don't save the toggle_node_info_ variables.
+  if (module_exists('node')) {
+    foreach (node_get_types() as $type => $name) {
+      unset($settings['toggle_node_info_' . $type]);
+    }
+  }
+  // Save default theme settings.
   variable_set(
     str_replace('/', '_', 'theme_'. $theme_key .'_settings'),
-    array_merge($defaults, theme_get_settings($theme_key))
+    array_merge($defaults, $settings)
   );
-  // Force refresh of Drupal internals
+  // Force refresh of Drupal internals.
   theme_get_setting('', TRUE);
 }
diff --git a/zen_classic/theme-settings-init.php b/zen_classic/theme-settings-init.php
index 9c892ce..e14e84d 100644
--- a/zen_classic/theme-settings-init.php
+++ b/zen_classic/theme-settings-init.php
@@ -18,11 +18,19 @@ if (is_null(theme_get_setting('zen_block_editing'))) {
     'zen_breadcrumb_trailing' => 0,
   );
 
-  // Save default theme settings
+  // Get default theme settings.
+  $settings = theme_get_settings($theme_key);
+  // Don't save the toggle_node_info_ variables.
+  if (module_exists('node')) {
+    foreach (node_get_types() as $type => $name) {
+      unset($settings['toggle_node_info_' . $type]);
+    }
+  }
+  // Save default theme settings.
   variable_set(
     str_replace('/', '_', 'theme_'. $theme_key .'_settings'),
-    array_merge($defaults, theme_get_settings($theme_key))
+    array_merge($defaults, $settings)
   );
-  // Force refresh of Drupal internals
+  // Force refresh of Drupal internals.
   theme_get_setting('', TRUE);
 }