From 0055b7ffbf2f33243b7a713e9ab5e4c991e8e5d3 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Fri, 10 Dec 2010 13:39:42 +0000 Subject: [PATCH] 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 --- includes/installer/DatabaseUpdater.php | 4 ---- 1 file changed, 4 deletions(-) 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 ) { -- 2.20.1