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

1 files changed, 2 insertions, 7 deletions

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.
  *