* (bug 2885) More PHP 5.1 fixes: skin, search, log, undelete

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b7bb284..907a1e3 100644 (file)
--- 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 c4390cf..ba08406 100644 (file)
--- 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 95c14bb..48aef1f 100644 (file)
--- 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 );