From 27bfa2854fe6a4b4811b7b26c632eafa54f7cb0e Mon Sep 17 00:00:00 2001 From: Antoine Musso Date: Thu, 24 Nov 2011 09:41:54 +0000 Subject: [PATCH] revert r102636 This move back the maintenance finalSetup code above core Setup. If we really need to do any setup after core Setup has run, we should use a new method in the Maintenance class. For example afterCoreSetup() --- maintenance/doMaintenance.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php index c93733314a..6b29c5fd54 100644 --- a/maintenance/doMaintenance.php +++ b/maintenance/doMaintenance.php @@ -93,11 +93,10 @@ if ( $maintenance->getDbType() === Maintenance::DB_ADMIN && { require( MWInit::interpretedPath( 'AdminSettings.php' ) ); } +$maintenance->finalSetup(); // Some last includes require_once( MWInit::compiledPath( 'includes/Setup.php' ) ); -$maintenance->finalSetup(); - // Much much faster startup than creating a title object $wgTitle = null; -- 2.20.1