r54254 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r54253‎ | r54254 | r54255 >
Date:04:32, 3 August 2009
Author:demon
Status:ok
Tags:
Comment:
Last update to call $dbw->sourceFile() directly. Throw wfDeprecated() in dbsource() since nothing in core or extensions calls this.
Modified paths:
  • /trunk/phase3/install-utils.inc (modified) (history)
  • /trunk/phase3/maintenance/FiveUpgrade.inc (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/FiveUpgrade.inc
@@ -526,7 +526,7 @@
527527 } else {
528528 global $IP;
529529 $this->log( 'adding iw_trans...' );
530 - dbsource( $IP . '/maintenance/archives/patch-interwiki-trans.sql', $this->dbw );
 530+ $this->dbw->sourceFile( $IP . '/maintenance/archives/patch-interwiki-trans.sql' );
531531 $this->log( 'added iw_trans.' );
532532 }
533533
Index: trunk/phase3/install-utils.inc
@@ -99,6 +99,7 @@
100100 # Read and execute SQL commands from a file
101101 #
102102 function dbsource( $fname, $db = false ) {
 103+ wfDeprecated( __METHOD__ );
103104 if ( !$db ) {
104105 // Try $wgDatabase, which is used in the install and update scripts
105106 global $wgDatabase;

Status & tagging log