From 9e7f41cd9161f3f17003fb1d56a9ae3663b7965b Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Tue, 7 Nov 2006 12:09:09 +0000
Subject: - Patch #92365 by chx: Garland does not display secondary tabs when
 color module is off.

---
 modules/color/color.module  | 2 --
 themes/garland/template.php | 3 ++-
 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();
 }
-- 
cgit v1.2.3