From 436c635ec1f2b48e88f81834891a81de216437a6 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Mon, 3 Aug 2009 04:32:50 +0000 Subject: [PATCH] Last update to call $dbw->sourceFile() directly. Throw wfDeprecated() in dbsource() since nothing in core or extensions calls this. --- install-utils.inc | 1 + maintenance/FiveUpgrade.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/install-utils.inc b/install-utils.inc index ab8e15dc8d..0e3ebc0ef3 100644 --- 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 b041a436fa..be0112e9ec 100644 --- 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.' ); } -- 2.20.1