From e66371cac17e35d2cb0c9bf48f792193b79f3a7c Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 6 May 2007 05:47:52 +0000
Subject: - Patch #137211 by merlinofchaos: move theme information to .info
 files and improved theme inheritance.

---
 themes/chameleon/chameleon.theme    | 3 +--
 themes/chameleon/marvin/marvin.info | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'themes/chameleon')

diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme
index 1c87653d3..9d8c24f98 100644
--- a/themes/chameleon/chameleon.theme
+++ b/themes/chameleon/chameleon.theme
@@ -9,10 +9,9 @@
 /**
  * Implementation of hook_theme. Auto-discover theme functions.
  */
-function chameleon_theme($existing) {
+function chameleon_theme($existing, $type, $theme, $path) {
   $templates = array();
   // Check for function overrides.
-  global $theme;
   foreach ($existing as $hook => $info) {
     if (function_exists($theme .'_'. $hook)) {
       $templates[$hook] = array(
diff --git a/themes/chameleon/marvin/marvin.info b/themes/chameleon/marvin/marvin.info
index d70394ee5..c77d66055 100644
--- a/themes/chameleon/marvin/marvin.info
+++ b/themes/chameleon/marvin/marvin.info
@@ -4,3 +4,4 @@ description = Boxy tabled theme in all grays.
 regions[left] = Left sidebar
 regions[right] = Right sidebar
 version = VERSION
+base theme = chameleon
-- 
cgit v1.2.3