From: Chad Horohoe <demon@users.mediawiki.org>
Date: Fri, 10 Dec 2010 13:39:42 +0000 (+0000)
Subject: Kill $wgDatabase in trunk (no need to backport this to REL1_17, it's harmless). Isn... 
X-Git-Tag: 1.31.0-rc.0~33397
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=0055b7ffbf2f33243b7a713e9ab5e4c991e8e5d3;p=lhc%2Fweb%2Fwiklou.git

Kill $wgDatabase in trunk (no need to backport this to REL1_17, it's harmless). Isn't used in extensions in 1.15 or above.
There is a $wgDatabase in Metavidwiki (and StarterWiki in 1.16), but it constructs it itself, so it's not the same as the global I'm killing
---

diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index a0afa5b370..d8b67b7e7e 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -40,12 +40,8 @@ abstract class DatabaseUpdater {
 	 * @param $db DatabaseBase object to perform updates on
 	 * @param $shared bool Whether to perform updates on shared tables
 	 * @param $maintenance Maintenance Maintenance object which created us
-	 *
-	 * @todo FIXME: Make $wgDatabase go away.
 	 */
 	protected function __construct( DatabaseBase &$db, $shared, Maintenance $maintenance = null ) {
-		global $wgDatabase;
-		$wgDatabase = $db;
 		$this->db = $db;
 		$this->shared = $shared;
 		if ( $maintenance ) {