diff options
| author | Dries Buytaert <dries@buytaert.net> | 2007-05-06 05:47:52 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2007-05-06 05:47:52 +0000 |
| commit | e66371cac17e35d2cb0c9bf48f792193b79f3a7c (patch) | |
| tree | 7a80591383246fb439f9c74960c927071a45b9f8 /themes/chameleon | |
| parent | 644657c56b6e04fb41e9b424668c61e0d1d6c1d4 (diff) | |
| download | brdo-e66371cac17e35d2cb0c9bf48f792193b79f3a7c.tar.gz brdo-e66371cac17e35d2cb0c9bf48f792193b79f3a7c.tar.bz2 | |
- Patch #137211 by merlinofchaos: move theme information to .info files and improved theme inheritance.
Diffstat (limited to 'themes/chameleon')
| -rw-r--r-- | themes/chameleon/chameleon.theme | 3 | ||||
| -rw-r--r-- | themes/chameleon/marvin/marvin.info | 1 |
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 |