From: Antoine Musso Date: Thu, 24 Nov 2011 09:41:54 +0000 (+0000) Subject: revert r102636 X-Git-Tag: 1.31.0-rc.0~26310 X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dcompta/operations/modifier.php?a=commitdiff_plain;h=27bfa2854fe6a4b4811b7b26c632eafa54f7cb0e;p=lhc%2Fweb%2Fwiklou.git 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() --- 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;