summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2006-11-07 12:09:09 +0000
committerDries Buytaert <dries@buytaert.net>2006-11-07 12:09:09 +0000
commit9e7f41cd9161f3f17003fb1d56a9ae3663b7965b (patch)
tree5d9c4d600851979f604e35e5c2dbbbb24f65c5ad
parent57688517f8a1191b4df2ad83526da2ad30dbd219 (diff)
downloadbrdo-9e7f41cd9161f3f17003fb1d56a9ae3663b7965b.tar.gz
brdo-9e7f41cd9161f3f17003fb1d56a9ae3663b7965b.tar.bz2
- Patch #92365 by chx: Garland does not display secondary tabs when color module is off.
-rw-r--r--modules/color/color.module2
-rw-r--r--themes/garland/template.php3
2 files changed, 2 insertions, 3 deletions
diff --git a/modules/color/color.module b/modules/color/color.module
index 5bb0d20b6..426fb641a 100644
--- a/modules/color/color.module
+++ b/modules/color/color.module
@@ -49,8 +49,6 @@ function _color_page_alter(&$vars) {
if ($logo && $vars['logo'] && preg_match('!'. $theme_key .'/logo.png$!', $vars['logo'])) {
$vars['logo'] = $logo;
}
-
- return $vars;
}
/**
diff --git a/themes/garland/template.php b/themes/garland/template.php
index a3ca8f9fe..51483e5ed 100644
--- a/themes/garland/template.php
+++ b/themes/garland/template.php
@@ -64,8 +64,9 @@ function _phptemplate_variables($hook, $vars) {
// Hook into color.module
if (module_exists('color')) {
- return _color_page_alter($vars);
+ _color_page_alter($vars);
}
+ return $vars;
}
return array();
}