summaryrefslogtreecommitdiffstats
path: root/zen
diff options
context:
space:
mode:
authorJohnAlbin2008-09-14 07:57:20 +0000
committerJohnAlbin2008-09-14 07:57:20 +0000
commitc9f9e83ab5544b0d2716aa14f766e792c7b4f011 (patch)
tree007c4ef716b26ebe8151adf8c07a23f1e4ac58e1 /zen
parent906052246bc09e88e89e1ca43a8edc964c9a8950 (diff)
Prevent PHP notices when theme registry is rebuilt before active theme is loaded.
Diffstat (limited to 'zen')
-rw-r--r--zen/template.theme-registry.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/zen/template.theme-registry.inc b/zen/template.theme-registry.inc
index e9fc524..b1e9b0f 100644
--- a/zen/template.theme-registry.inc
+++ b/zen/template.theme-registry.inc
@@ -79,8 +79,10 @@ function zen_theme_get_default_settings($theme) {
str_replace('/', '_', 'theme_' . $theme . '_settings'),
array_merge($defaults, $settings)
);
- // Force refresh of Drupal internals.
- theme_get_setting('', TRUE);
+ // If the active theme has been loaded, force refresh of Drupal internals.
+ if (!empty($GLOBALS['theme_key'])) {
+ theme_get_setting('', TRUE);
+ }
}
// Return the default settings.