Remove superfluous inclusion of SiteConfiguration in doMaintenance. It's in the AutoL...

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 469dda8..a59676e 100644 (file)
--- 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 bf95da1..b797de6 100644 (file)
--- 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' ) );