- Patch #137211 by merlinofchaos: move theme information to .info files and improved theme inheritance.

7 files changed, 8 insertions, 9 deletions

diff --git a/themes/bluemarine/bluemarine.info b/themes/bluemarine/bluemarine.info
index 366a5d3bd..15646d9df 100644
--- a/themes/bluemarine/bluemarine.info
+++ b/themes/bluemarine/bluemarine.info
@@ -2,3 +2,4 @@
 name = Bluemarine
 description = Table-based multi-column theme with a marine and ash color scheme.
 version = VERSION
+engine = phptemplate
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
diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine
index 86f1a002f..4e9c065af 100644
--- a/themes/engines/phptemplate/phptemplate.engine
+++ b/themes/engines/phptemplate/phptemplate.engine
@@ -19,11 +19,11 @@ function phptemplate_init($template) {
  * pre-defined by Drupal so that we can use that information if
  * we need to.
  */
-function phptemplate_theme($existing) {
+function phptemplate_theme($existing, $type, $theme, $path) {
   $templates = array();
 
   // Check for template overrides.
-  $files = drupal_system_listing('\.tpl\.php$', path_to_theme(), 'name', 0);
+  $files = drupal_system_listing('\.tpl\.php$', $path, 'name', 0);
 
   foreach ($files as $template => $file) {
     // chop off the .tpl
@@ -37,7 +37,6 @@ function phptemplate_theme($existing) {
   }
 
   // Check for function overrides.
-  global $theme;
   foreach ($existing as $hook => $info) {
     if (function_exists($theme .'_'. $hook)) {
       $templates[$hook] = array(
@@ -54,10 +53,6 @@ function phptemplate_theme($existing) {
   return $templates;
 }
 
-function phptemplate_templates($directory = 'themes') {
-  return drupal_system_listing('^page\.tpl\.php$', $directory, 'filename');
-}
-
 /**
  * Adds additional helper variables to all templates.
  *
diff --git a/themes/garland/garland.info b/themes/garland/garland.info
index 68d9c57c1..740e03425 100644
--- a/themes/garland/garland.info
+++ b/themes/garland/garland.info
@@ -2,3 +2,4 @@
 name = Garland
 description = Tableless, recolorable, multi-column, fluid width theme (default).
 version = VERSION
+engine = phptemplate
diff --git a/themes/garland/minnelli/minnelli.info b/themes/garland/minnelli/minnelli.info
index 66e0d8fa9..3fb7d16a6 100644
--- a/themes/garland/minnelli/minnelli.info
+++ b/themes/garland/minnelli/minnelli.info
@@ -2,3 +2,4 @@
 name = Minnelli
 description = Tableless, recolorable, multi-column, fixed width theme.
 version = VERSION
+base theme = garland
diff --git a/themes/pushbutton/pushbutton.info b/themes/pushbutton/pushbutton.info
index 895373d86..cbe4aca15 100644
--- a/themes/pushbutton/pushbutton.info
+++ b/themes/pushbutton/pushbutton.info
@@ -2,3 +2,4 @@
 name = Pushbutton
 description = Tabled, multi-column theme in blue and orange tones.
 version = VERSION
+engine = phptemplate