From 1fc8be3b124686e98965607f11257b66ae459a03 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 28 Aug 2005 21:58:14 +0000
Subject: [PATCH] * (bug 2885) More PHP 5.1 fixes: skin, search, log, undelete

---
 RELEASE-NOTES             | 2 +-
 includes/Database.php     | 2 +-
 includes/SkinTemplate.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b7bb284108..907a1e3047 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -68,8 +68,8 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 3284) Ipblocklist paging, substring search
 * Allow filtering of robot edits in Special:Watchlist by stting 
   $wgFilterRobotsWL = true.
+* (bug 2885) More PHP 5.1 fixes: skin, search, log, undelete
 
->>>>>>> 1.394
 
 === Caveats ===
 
diff --git a/includes/Database.php b/includes/Database.php
index c4390cf4b7..ba08406d21 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -1522,7 +1522,7 @@ class Database {
 	/**
 	 * @todo document
 	 */
-	function resultObject( &$result ) {
+	function resultObject( $result ) {
 		if( empty( $result ) ) {
 			return NULL;
 		} else {
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 95c14bbe81..48aef1f4d6 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -225,7 +225,7 @@ class SkinTemplate extends Skin {
 		$tpl->setRef( 'jsmimetype', $wgJsMimeType );
 		$tpl->setRef( 'charset', $wgOutputEncoding );
 		$tpl->set( 'headlinks', $out->getHeadLinks() );
-		$tpl->setRef('headscripts', $out->getScript() );
+		$tpl->set('headscripts', $out->getScript() );
 		$tpl->setRef( 'wgScript', $wgScript );
 		$tpl->setRef( 'skinname', $this->skinname );
 		$tpl->setRef( 'stylename', $this->stylename );
-- 
2.20.1