From: Chad Horohoe <demon@users.mediawiki.org>
Date: Thu, 30 Jun 2011 21:25:52 +0000 (+0000)
Subject: Remove superfluous inclusion of SiteConfiguration in doMaintenance. It's in the AutoL... 
X-Git-Tag: 1.31.0-rc.0~29137
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=226b5730a3f1b4dbc6d4c2d53e7c4d6824694e37;p=lhc%2Fweb%2Fwiklou.git

Remove superfluous inclusion of SiteConfiguration in doMaintenance. It's in the AutoLoader and has already been initialized by DefaultSettings by this point.

As a result: rm DIY inclusion protection, since this was the only reason it was still needed.
---

diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index 469dda89e1..a59676e039 100644
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -1,17 +1,4 @@
 <?php
-
-/**
- * The include paths change after this file is included from commandLine.inc,
- * meaning that require_once() fails to detect that it is including the same
- * file again. We use DIY C-style protection as a workaround.
- */
-
-// Hide this pattern from Doxygen, which spazzes out at it
-/// @cond
-if( !defined( 'SITE_CONFIGURATION' ) ){
-define( 'SITE_CONFIGURATION', 1 );
-/// @endcond
-
 /**
  * This is a class used to hold configuration settings, particularly for multi-wiki sites.
  */
diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index bf95da1e79..b797de6b38 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -81,7 +81,6 @@ if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
 	# Maybe a hook?
 	global $cluster;
 	$cluster = 'pmtpa';
-	require_once( MWInit::compiledPath( 'includes/SiteConfiguration.php' ) );
 	require( MWInit::interpretedPath( 'wmf-config/wgConf.php' ) );
 	$maintenance->loadWikimediaSettings();
 	require( MWInit::interpretedPath( '/wmf-config/CommonSettings.php' ) );