Commit 9062b566 authored by Kjartan's avatar Kjartan

- 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!
parent 8c70eae2
......@@ -29,6 +29,7 @@ ErrorDocument 500 /error.php
php_value session.cookie_lifetime 2000000
php_value session.auto_start 0
php_value session.save_handler user
php_value allow_call_time_pass_reference Off
</IfModule>
# Various rewrite rules
......
......@@ -8,7 +8,7 @@ function header($title = "") {
$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 @@ function image($name) {
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 @@ function footer() {
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) {
......
......@@ -407,10 +407,10 @@ function sendPayloadHTTP10($msg, $server, $port, $timeout=0,
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;
}
......
<?php
// $Id$
class Theme extends BaseTheme {
class Theme_example extends BaseTheme {
}
......
......@@ -12,7 +12,7 @@
*********************************************************************/
class Theme extends BaseTheme {
class Theme_goofy extends BaseTheme {
// General colorset that can be used for this theme
var $foreground = "#000000";
var $background = "#FFFFFF";
......@@ -150,7 +150,6 @@ function footer() {
</td>
<td valign="top">
<?php
$this->user("all");
theme_blocks("all", $this);
?>
</td>
......
......@@ -11,7 +11,7 @@
*********************************************************************/
class Theme extends BaseTheme {
class Theme_marvin extends BaseTheme {
var $link = "#666699";
// General colorset that can be used for this theme
......@@ -174,7 +174,6 @@ function footer() {
</td>
<td valign="top" width="200">
<?php
$this->user("all");
theme_blocks("all", $this);
?>
</td>
......
......@@ -11,7 +11,7 @@
*********************************************************************/
class Theme extends BaseTheme {
class Theme_unconed extends BaseTheme {
var $foreground = "#000000";
var $background = "#FFFFFF";
......@@ -191,7 +191,6 @@ function footer() {
</TD>
<TD VALIGN="top" WIDTH="20%">
<?php
$this->user("all");
theme_blocks("all", $this);
?>
</TD>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment