Checking images for syntax errors can yield funky results:)

[lhc/web/wiklou.git] / maintenance / FiveUpgrade.inc

diff --git a/maintenance/FiveUpgrade.inc b/maintenance/FiveUpgrade.inc
index 5632241..be0112e 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" );
@@ -526,7 +526,7 @@ class FiveUpgrade {
                } else {
                        global $IP;
                        $this->log( 'adding iw_trans...' );
-                       dbsource( $IP . '/maintenance/archives/patch-interwiki-trans.sql', $this->dbw );
+                       $this->dbw->sourceFile( $IP . '/maintenance/archives/patch-interwiki-trans.sql' );
                        $this->log( 'added iw_trans.' );
                }