Last update to call $dbw->sourceFile() directly. Throw wfDeprecated() in dbsource...

diff --git a/install-utils.inc b/install-utils.inc
index ab8e15d..0e3ebc0 100644 (file)
--- a/install-utils.inc
+++ b/install-utils.inc
@@ -99,6 +99,7 @@ function readconsole( $prompt = '' ) {
 # Read and execute SQL commands from a file
 #
 function dbsource( $fname, $db = false ) {
+       wfDeprecated( __METHOD__ );
        if ( !$db ) {
                // Try $wgDatabase, which is used in the install and update scripts
                global $wgDatabase;

diff --git a/maintenance/FiveUpgrade.inc b/maintenance/FiveUpgrade.inc
index b041a43..be0112e 100644 (file)
--- a/maintenance/FiveUpgrade.inc
+++ b/maintenance/FiveUpgrade.inc
@@ -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.' );
                }