- changing theme patch. Now Drupal will init the $this->path automatically.

4 files changed, 2 insertions, 14 deletions

diff --git a/includes/theme.inc b/includes/theme.inc
index 8c3047466..11b1877a4 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -139,7 +139,8 @@ function theme_init() {
   if (is_object($themes[$name])) {
     include_once($themes[$name]->filename);
     $theme_class = "Theme_$name";
-    @$obj =& new $theme_class($themes[$name]->filename);
+    @$obj =& new $theme_class();
+    $obj->path = dirname($themes[$name]->filename);
     return $obj;
   }
 
diff --git a/themes/goofy/goofy.theme b/themes/goofy/goofy.theme
index efeefa991..f41cd4ae7 100644
--- a/themes/goofy/goofy.theme
+++ b/themes/goofy/goofy.theme
@@ -17,10 +17,6 @@
     var $foreground = "#000000";
     var $background = "#FFFFFF";
 
-    function Theme_goofy($filename) {
-      $this->path = dirname($filename);
-    }
-
     function system($field) {
       $system["name"] = "Goofy";
       $system["author"] = "Steven Wittens";
diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme
index 69096d8a9..b328bba7a 100644
--- a/themes/marvin/marvin.theme
+++ b/themes/marvin/marvin.theme
@@ -18,10 +18,6 @@
    var $foreground = "#000000";
    var $background = "#EAEAEA";
    
-   function Theme_marvin($filename) {
-     $this->path = dirname($filename);
-   }
-  
    function system($field) {
      $system["name"] = "Marvin";
      $system["author"] = "Dries";
diff --git a/themes/unconed/unconed.theme b/themes/unconed/unconed.theme
index bbcfece95..61a1ff637 100644
--- a/themes/unconed/unconed.theme
+++ b/themes/unconed/unconed.theme
@@ -16,7 +16,6 @@
    var $background = "#FFFFFF";
 
    var $link = "#000000";
-   var $themename = "unconed";
 
    var $cl80 = "#8f9399";
    var $clc0 = "#c8c8d0";
@@ -37,10 +36,6 @@
    var $bgcolor3 = "#D7D7D7";
    var $fgcolor3 = "#000000";
 
-   function Theme_unconed($filename) {
-     $this->path = dirname($filename);
-   }
-
    function system($field) {
      $system["name"] = "UnConeD";
      $system["author"] = "Steven Wittens";