summaryrefslogtreecommitdiff
path: root/themes/chameleon
diff options
context:
space:
mode:
Diffstat (limited to 'themes/chameleon')
-rw-r--r--themes/chameleon/chameleon.theme3
-rw-r--r--themes/chameleon/marvin/marvin.info1
2 files changed, 2 insertions, 2 deletions
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