From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Fri, 10 Sep 2010 11:10:33 +0000 (+0000)
Subject: Removed $wgDatabase from dbsource()
X-Git-Tag: 1.31.0-rc.0~35064
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=755581b81a9392fe2570865e16ceb8e9a384fa37;p=lhc%2Fweb%2Fwiklou.git

Removed $wgDatabase from dbsource()
---

diff --git a/maintenance/install-utils.inc b/maintenance/install-utils.inc
index f865aca326..546dad42c9 100644
--- a/maintenance/install-utils.inc
+++ b/maintenance/install-utils.inc
@@ -180,14 +180,7 @@ function readlineEmulation( $prompt ) {
 function dbsource( $fname, $db = false ) {
 	wfDeprecated( __METHOD__ );
 	if ( !$db ) {
-		// Try $wgDatabase, which is used in the install and update scripts
-		global $wgDatabase;
-		if ( isset( $wgDatabase ) ) {
-			$db = $wgDatabase;
-		} else {
-			// No? Well, we must be outside of those scripts, so use the standard method
-			$db = wfGetDB( DB_MASTER );
-		}
+		$db = wfGetDB( DB_MASTER );
 	}
 	$error = $db->sourceFile( $fname );
 	if ( $error !== true ) {