- applying patches from Axel Kollmorgen. See

  http://list.drupal.org/drupal-devel/2002-February/thread.html#6678
  http://list.drupal.org/drupal-devel/2002-February/thread.html#6629
- removed references to $this->user() from themes.
- removed $BaseTheme->user(). It was deprecated a while back.

NOTE: this update will break custom themes, so make sure you update your
themes before updating!

2 files changed, 9 insertions, 10 deletions

diff --git a/includes/theme.inc b/includes/theme.inc
index 62c790919..48b61589d 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -8,7 +8,7 @@ class BaseTheme {
     $output .= "<table border=\"0\" cellspacing=\"4\" cellpadding=\"4\"><tr><td valign=\"top\" width=\"170\">";
 
     print $output;
-    $this->box(t("Navigation"), implode("<br />", link_page())); $this->user("all", $this); theme_blocks("all", $this);
+    $this->box(t("Navigation"), implode("<br />", link_page())); theme_blocks("all", $this);
     print "</td><td valign=\"top\">";
 
   }
@@ -21,9 +21,6 @@ class BaseTheme {
     return "misc/$name";
   }
 
-  function user($region) {
-  }
-
   function node($node, $main) {
     $output .= "<b>". check_output($node->title) ."</b> by ". format_name($node) ."<br />";
     if ($main && $node->teaser) {
@@ -74,13 +71,15 @@ class BaseTheme {
 function theme_init() {
   global $user, $themes;
 
-  if ($user->theme && file_exists($themes[$user->theme][0])) {
-    include_once $themes[$user->theme][0];
+  if ($user->theme && file_exists($themes[$theme_name = $user->theme][0])) {
+    include_once $themes[$theme_name][0];
   }
   else {
-    include_once $themes[variable_get("theme_default", key($themes))][0];
+    include_once $themes[$theme_name = variable_get("theme_default", key($themes))][0];
   }
-  return new Theme();
+
+  $theme_class = 'Theme_'. $theme_name;
+  return new $theme_class();
 }
 
 function theme_blocks($region, &$theme) {
diff --git a/includes/xmlrpc.inc b/includes/xmlrpc.inc
index 78ff37700..db6d68b36 100644
--- a/includes/xmlrpc.inc
+++ b/includes/xmlrpc.inc
@@ -407,10 +407,10 @@ class xmlrpc_client {
     if ($port==0) $port=80;
     if($timeout>0)
       $fp=fsockopen($server, $port,
-        &$this->errno, &$this->errstr, $timeout);
+        $this->errno, $this->errstr, $timeout);
     else
       $fp=fsockopen($server, $port,
-        &$this->errno, &$this->errstr);
+        $this->errno, $this->errstr);
     if (!$fp) {
       return 0;
     }