Kill $wgDatabase in trunk (no need to backport this to REL1_17, it's harmless). Isn...

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 a0afa5b..d8b67b7 100644 (file)
--- 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 ) {