(bug 17478) Fixed a PHP Strict standards error in maintenance/cleanupWatchlist.php

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c89f537..5ce56ed 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -164,6 +164,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 17420) Send the correct content type from action=raw when the HTML file 
   cache is enabled.
 * (bug 12746) Do not allow new password e-mails when wiki is in read-only mode
+* (bug 17478) Fixed a PHP Strict standards error in
+  maintenance/cleanupWatchlist.php
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions

diff --git a/maintenance/FiveUpgrade.inc b/maintenance/FiveUpgrade.inc
index 5632241..b041a43 100644 (file)
--- a/maintenance/FiveUpgrade.inc
+++ b/maintenance/FiveUpgrade.inc
@@ -97,7 +97,7 @@ class FiveUpgrade {
                global $wgDBtype;
 
                $timeout = 3600 * 24;
-               $db =& $this->newConnection();
+               $db = $this->newConnection();
                $db->bufferResults( false );
                if ($wgDBtype == 'mysql') {
                        $db->query( "SET net_read_timeout=$timeout" );