summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohnAlbin2009-10-24 11:25:26 (GMT)
committer JohnAlbin2009-10-24 11:25:26 (GMT)
commit842c56076eb0a3761d259acaa984c99a45540767 (patch)
treea80ec873e8d69c0813e1aec6db6d830f7723da38
parent17e89a6fe7b7851f0e7d677f62da6a60094696d0 (diff)
#311458: Search box gets disabled after arbitrary amount of time
-rw-r--r--CHANGELOG.txt3
-rw-r--r--zen-internals/template.theme-registry.inc17
2 files changed, 6 insertions, 14 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4cdc3e8..bd0472e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,7 +2,8 @@
Zen 6.x-2.x-dev, xxxx-xx-xx (development release)
------------------------
-- Added $classes and $classes_array to all templates, not just Zen's templates.
+- #311458: Search box gets disabled after arbitrary amount of time
+- Added $classes and $classes_array to all templates, not just Zen's templates
- Renamed page.tpl's $body_classes and $body_classes_array to $classes and $classes_array
- #564068: Views classes are missing from $classes variable
- Simplified header, content_top, content_bottom, navbar, and footer region markup
diff --git a/zen-internals/template.theme-registry.inc b/zen-internals/template.theme-registry.inc
index 8fa0c1c..72d8a6c 100644
--- a/zen-internals/template.theme-registry.inc
+++ b/zen-internals/template.theme-registry.inc
@@ -89,19 +89,10 @@ function zen_theme_get_default_settings($theme) {
$defaults = !empty($themes[$theme]->info['settings']) ? $themes[$theme]->info['settings'] : array();
if (!empty($defaults)) {
- // Get the theme settings saved in the database.
- $settings = theme_get_settings($theme);
- // 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 . '_settings'),
- array_merge($defaults, $settings)
- );
+ // Merge the defaults with the theme settings saved in the database.
+ $settings = array_merge($defaults, variable_get('theme_'. $theme .'_settings', array()));
+ // Save the settings back to the database.
+ variable_set('theme_'. $theme .'_settings', $settings);
// If the active theme has been loaded, force refresh of Drupal internals.
if (!empty($GLOBALS['theme_key'])) {
theme_get_setting('', TRUE);