Fix concern raised by Brion in r74108 (but has really existed since the maintenance...

Until now, we relied on setting MW_NO_SETUP which was a) hacky, b) irreversable, and c) likely to be forgotten if you didn't use one of the wrappers like runChild().

Instead, move the freaky magic to doMaintenance and have *it* check if it's in a specific call stack that indicates this is being run from the file scope and should be executed. Rename DO_MAINTENANCE to RUN_MAINTENANCE_IF_MAIN so it's nice and clear what magic happens behind the require_once().

diff --git a/docs/maintenance.txt b/docs/maintenance.txt
index 039c71c..988ff28 100644 (file)
--- a/docs/maintenance.txt
+++ b/docs/maintenance.txt
@@ -47,7 +47,7 @@ class DemoMaint extends Maintenance {
 }
 
 $maintClass = "DemoMaint";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
 
 ==END==
 

diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index badcc64..5bdfec5 100644 (file)
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -167,10 +167,6 @@ abstract class DatabaseUpdater {
        public function doUpdates( $purge = true ) {
                global $wgVersion;
 
-               if ( !defined( 'MW_NO_SETUP' ) ) {
-                       define( 'MW_NO_SETUP', true );
-               }
-
                $this->runUpdates( $this->getCoreUpdateList(), false );
                $this->runUpdates( $this->getOldGlobalUpdates(), false );
                $this->runUpdates( $this->getExtensionUpdates(), true );

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index d048b7b..df2c63c 100644 (file)
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -21,7 +21,9 @@
  */
 
 // Define this so scripts can easily find doMaintenance.php
-define( 'DO_MAINTENANCE', dirname( __FILE__ ) . '/doMaintenance.php' );
+define( 'RUN_MAINTENANCE_IF_MAIN', dirname( __FILE__ ) . '/doMaintenance.php' );
+define( 'DO_MAINTENANCE', RUN_MAINTENANCE_IF_MAIN ); // original name, harmless
+
 $maintClass = false;
 
 // Make sure we're on PHP5 or better
@@ -116,6 +118,23 @@ abstract class Maintenance {
                register_shutdown_function( array( $this, 'outputChanneled' ), false );
        }
 
+       /**
+        * Should we execute the maintenance script, or just allow it to be included
+        * as a standalone class? It checks that the call stack only includes this
+        * function and a require (meaning was called from the file scope)
+        *
+        * @return Boolean
+        */
+       public static function shouldExecute() {
+               $bt = debug_backtrace();
+               if( count( $bt ) !== 2 ) {
+                       return false;
+               }
+               return $bt[1]['function'] == 'require_once' &&
+                       $bt[0]['class'] == 'Maintenance' &&
+                       $bt[0]['function'] == 'shouldExecute';
+       }
+
        /**
         * Do the actual work. All child classes will need to implement this
         */
@@ -389,10 +408,6 @@ abstract class Maintenance {
         * @return Maintenance child
         */
        public function runChild( $maintClass, $classFile = null ) {
-               // If we haven't already specified, kill setup procedures
-               // for child scripts, we've already got a sane environment
-               self::disableSetup();
-
                // Make sure the class is loaded first
                if ( !class_exists( $maintClass ) ) {
                        if ( $classFile ) {
@@ -408,15 +423,6 @@ abstract class Maintenance {
                return $child;
        }
 
-       /**
-        * Disable Setup.php mostly
-        */
-       protected static function disableSetup() {
-               if ( !defined( 'MW_NO_SETUP' ) ) {
-                       define( 'MW_NO_SETUP', true );
-               }
-       }
-
        /**
         * Do some sanity checking and basic setup
         */
@@ -943,7 +949,6 @@ abstract class Maintenance {
         */
        protected static function getCoreScripts() {
                if ( !self::$mCoreScripts ) {
-                       self::disableSetup();
                        $paths = array(
                                dirname( __FILE__ ),
                                dirname( __FILE__ ) . '/gearman',

diff --git a/maintenance/addwiki.php b/maintenance/addwiki.php
index 7a0fa6f..53699f2 100644 (file)
--- a/maintenance/addwiki.php
+++ b/maintenance/addwiki.php
@@ -464,4 +464,4 @@ EOT;
 }
 
 $maintClass = "AddWiki";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/attachLatest.php b/maintenance/attachLatest.php
index 449b67f..e6287f4 100644 (file)
--- a/maintenance/attachLatest.php
+++ b/maintenance/attachLatest.php
@@ -78,4 +78,4 @@ class AttachLatest extends Maintenance {
 }
 
 $maintClass = "AttachLatest";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/benchmarks/bench_HTTP_HTTPS.php b/maintenance/benchmarks/bench_HTTP_HTTPS.php
index 5c37492..0038b2d 100644 (file)
--- a/maintenance/benchmarks/bench_HTTP_HTTPS.php
+++ b/maintenance/benchmarks/bench_HTTP_HTTPS.php
@@ -54,4 +54,4 @@ class bench_HTTP_HTTPS extends Benchmarker {
 }
 
 $maintClass = 'bench_HTTP_HTTPS';
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/benchmarks/bench_strtr_str_replace.php b/maintenance/benchmarks/bench_strtr_str_replace.php
index 565f3a1..ae57698 100644 (file)
--- a/maintenance/benchmarks/bench_strtr_str_replace.php
+++ b/maintenance/benchmarks/bench_strtr_str_replace.php
@@ -47,4 +47,4 @@ class bench_strtr_str_replace extends Benchmarker {
 }
 
 $maintClass = 'bench_strtr_str_replace';
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/benchmarks/bench_wfIsWindows.php b/maintenance/benchmarks/bench_wfIsWindows.php
index 975f72a..4c35221 100644 (file)
--- a/maintenance/benchmarks/bench_wfIsWindows.php
+++ b/maintenance/benchmarks/bench_wfIsWindows.php
@@ -58,4 +58,4 @@ class bench_wfIsWindows extends Benchmarker {
 }
 
 $maintClass = 'bench_wfIsWindows';
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/benchmarks/benchmarkPurge.php b/maintenance/benchmarks/benchmarkPurge.php
index 7eaff8d..4ab7aa1 100644 (file)
--- a/maintenance/benchmarks/benchmarkPurge.php
+++ b/maintenance/benchmarks/benchmarkPurge.php
@@ -103,4 +103,4 @@ class BenchmarkPurge extends Benchmarker {
 }
 
 $maintClass = "BenchmarkPurge";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/changePassword.php b/maintenance/changePassword.php
index a306454..568952b 100644 (file)
--- a/maintenance/changePassword.php
+++ b/maintenance/changePassword.php
@@ -50,4 +50,4 @@ class ChangePassword extends Maintenance {
 }
 
 $maintClass = "ChangePassword";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/checkAutoLoader.php b/maintenance/checkAutoLoader.php
index 9dc935e..d199b6f 100644 (file)
--- a/maintenance/checkAutoLoader.php
+++ b/maintenance/checkAutoLoader.php
@@ -55,4 +55,4 @@ class CheckAutoLoader extends Maintenance {
 }
 
 $maintClass = "CheckAutoLoader";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/checkBadRedirects.php b/maintenance/checkBadRedirects.php
index c5d89a0..52bfa65 100644 (file)
--- a/maintenance/checkBadRedirects.php
+++ b/maintenance/checkBadRedirects.php
@@ -57,4 +57,4 @@ class CheckBadRedirects extends Maintenance {
 }
 
 $maintClass = "CheckBadRedirects";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/checkImages.php b/maintenance/checkImages.php
index fa06461..96b93f2 100644 (file)
--- a/maintenance/checkImages.php
+++ b/maintenance/checkImages.php
@@ -80,4 +80,4 @@ class CheckImages extends Maintenance {
 }
 
 $maintClass = "CheckImages";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/checkSyntax.php b/maintenance/checkSyntax.php
index e73dcfa..396cac5 100644 (file)
--- a/maintenance/checkSyntax.php
+++ b/maintenance/checkSyntax.php
@@ -295,5 +295,5 @@ class CheckSyntax extends Maintenance {
 }
 
 $maintClass = "CheckSyntax";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
 

diff --git a/maintenance/checkUsernames.php b/maintenance/checkUsernames.php
index 414d098..b368432 100644 (file)
--- a/maintenance/checkUsernames.php
+++ b/maintenance/checkUsernames.php
@@ -52,4 +52,4 @@ class CheckUsernames extends Maintenance {
 }
 
 $maintClass = "CheckUsernames";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/cleanupCaps.php b/maintenance/cleanupCaps.php
index 495bfce..2d945a5 100644 (file)
--- a/maintenance/cleanupCaps.php
+++ b/maintenance/cleanupCaps.php
@@ -95,4 +95,4 @@ class CapsCleanup extends TableCleanup {
 }
 
 $maintClass = "CapsCleanup";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/cleanupImages.php b/maintenance/cleanupImages.php
index 818b9ed..b25b9bb 100644 (file)
--- a/maintenance/cleanupImages.php
+++ b/maintenance/cleanupImages.php
@@ -204,4 +204,4 @@ class ImageCleanup extends TableCleanup {
 }
 
 $maintClass = "ImageCleanup";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/cleanupRemovedModules.php b/maintenance/cleanupRemovedModules.php
index a9ee968..fb8afd2 100644 (file)
--- a/maintenance/cleanupRemovedModules.php
+++ b/maintenance/cleanupRemovedModules.php
@@ -86,4 +86,4 @@ class CleanupRemovedModules extends Maintenance {
 }
 
 $maintClass = "CleanupRemovedModules";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/cleanupSpam.php b/maintenance/cleanupSpam.php
index ce3f726..8561281 100644 (file)
--- a/maintenance/cleanupSpam.php
+++ b/maintenance/cleanupSpam.php
@@ -128,4 +128,4 @@ class CleanupSpam extends Maintenance {
 }
 
 $maintClass = "CleanupSpam";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/cleanupTitles.php b/maintenance/cleanupTitles.php
index bb7aaa7..f03b795 100644 (file)
--- a/maintenance/cleanupTitles.php
+++ b/maintenance/cleanupTitles.php
@@ -152,4 +152,4 @@ class TitleCleanup extends TableCleanup {
 }
 
 $maintClass = "TitleCleanup";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/cleanupWatchlist.php b/maintenance/cleanupWatchlist.php
index 8c85edf..a9b20fe 100644 (file)
--- a/maintenance/cleanupWatchlist.php
+++ b/maintenance/cleanupWatchlist.php
@@ -85,4 +85,4 @@ class WatchlistCleanup extends TableCleanup {
 }
 
 $maintClass = "WatchlistCleanup";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/clear_interwiki_cache.php b/maintenance/clear_interwiki_cache.php
index c1fd417..953bd4c 100644 (file)
--- a/maintenance/clear_interwiki_cache.php
+++ b/maintenance/clear_interwiki_cache.php
@@ -51,4 +51,4 @@ class ClearInterwikiCache extends Maintenance {
 }
 
 $maintClass = "ClearInterwikiCache";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/clear_stats.php b/maintenance/clear_stats.php
index 4bd79a5..8f91864 100644 (file)
--- a/maintenance/clear_stats.php
+++ b/maintenance/clear_stats.php
@@ -51,4 +51,4 @@ class clear_stats extends Maintenance {
 }
 
 $maintClass = "clear_stats";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index 3228ab1..f57c0b6 100644 (file)
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -61,5 +61,5 @@ class CommandLineInc extends Maintenance {
 }
 
 $maintClass = 'CommandLineInc';
-require( DO_MAINTENANCE );
+require( RUN_MAINTENANCE_IF_MAIN );
 

diff --git a/maintenance/compareParsers.php b/maintenance/compareParsers.php
index 87d00c6..069e55e 100644 (file)
--- a/maintenance/compareParsers.php
+++ b/maintenance/compareParsers.php
@@ -191,4 +191,4 @@ class CompareParsers extends Maintenance {
 }
 
 $maintClass = "CompareParsers";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/convertLinks.php b/maintenance/convertLinks.php
index d4c8cc2..85ef5c8 100644 (file)
--- a/maintenance/convertLinks.php
+++ b/maintenance/convertLinks.php
@@ -251,4 +251,4 @@ This gives a huge speed improvement for very large links tables which are MyISAM
 }
 
 $maintClass = "ConvertLinks";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/convertUserOptions.php b/maintenance/convertUserOptions.php
index 2305443..278d40f 100644 (file)
--- a/maintenance/convertUserOptions.php
+++ b/maintenance/convertUserOptions.php
@@ -70,4 +70,4 @@ class ConvertUserOptions extends Maintenance {
 }
 
 $maintClass = "ConvertUserOptions";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/createAndPromote.php b/maintenance/createAndPromote.php
index d62e16a..8bff284 100644 (file)
--- a/maintenance/createAndPromote.php
+++ b/maintenance/createAndPromote.php
@@ -72,4 +72,4 @@ class CreateAndPromote extends Maintenance {
 }
 
 $maintClass = "CreateAndPromote";
-require_once( DO_MAINTENANCE );
\ No newline at end of file
+require_once( RUN_MAINTENANCE_IF_MAIN );
\ No newline at end of file

diff --git a/maintenance/deleteArchivedFiles.php b/maintenance/deleteArchivedFiles.php
index 61da0dc..6067c80 100644 (file)
--- a/maintenance/deleteArchivedFiles.php
+++ b/maintenance/deleteArchivedFiles.php
@@ -49,4 +49,4 @@ class DeleteArchivedFiles extends Maintenance {
 }
 
 $maintClass = "DeleteArchivedFiles";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/deleteArchivedRevisions.php b/maintenance/deleteArchivedRevisions.php
index 0f77c53..0faa0ab 100644 (file)
--- a/maintenance/deleteArchivedRevisions.php
+++ b/maintenance/deleteArchivedRevisions.php
@@ -52,4 +52,4 @@ class DeleteArchivedRevisions extends Maintenance {
 }
 
 $maintClass = "DeleteArchivedRevisions";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/deleteBatch.php b/maintenance/deleteBatch.php
index 9eb55a1..c8bb480 100644 (file)
--- a/maintenance/deleteBatch.php
+++ b/maintenance/deleteBatch.php
@@ -110,4 +110,4 @@ class DeleteBatch extends Maintenance {
 }
 
 $maintClass = "DeleteBatch";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/deleteDefaultMessages.php b/maintenance/deleteDefaultMessages.php
index ca10362..fc482ac 100644 (file)
--- a/maintenance/deleteDefaultMessages.php
+++ b/maintenance/deleteDefaultMessages.php
@@ -79,4 +79,4 @@ class DeleteDefaultMessages extends Maintenance {
 }
 
 $maintClass = "DeleteDefaultMessages";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/deleteImageMemcached.php b/maintenance/deleteImageMemcached.php
index 2df582f..007f0d1 100644 (file)
--- a/maintenance/deleteImageMemcached.php
+++ b/maintenance/deleteImageMemcached.php
@@ -72,4 +72,4 @@ class DeleteImageCache extends Maintenance {
 }
 
 $maintClass = "DeleteImageCache";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/deleteOldRevisions.php b/maintenance/deleteOldRevisions.php
index 736a242..ba76e9e 100644 (file)
--- a/maintenance/deleteOldRevisions.php
+++ b/maintenance/deleteOldRevisions.php
@@ -97,5 +97,5 @@ class DeleteOldRevisions extends Maintenance {
 }
 
 $maintClass = "DeleteOldRevisions";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
 

diff --git a/maintenance/deleteOrphanedRevisions.php b/maintenance/deleteOrphanedRevisions.php
index 7b1235b..e972d1f 100644 (file)
--- a/maintenance/deleteOrphanedRevisions.php
+++ b/maintenance/deleteOrphanedRevisions.php
@@ -85,5 +85,5 @@ class DeleteOrphanedRevisions extends Maintenance {
 }
 
 $maintClass = "DeleteOrphanedRevisions";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
 

diff --git a/maintenance/deleteRevision.php b/maintenance/deleteRevision.php
index 24fdbe4..5e8ecaa 100644 (file)
--- a/maintenance/deleteRevision.php
+++ b/maintenance/deleteRevision.php
@@ -78,4 +78,4 @@ class DeleteRevision extends Maintenance {
 }
 
 $maintClass = "DeleteRevision";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/deleteSelfExternals.php b/maintenance/deleteSelfExternals.php
index 783a7dd..db23e92 100644 (file)
--- a/maintenance/deleteSelfExternals.php
+++ b/maintenance/deleteSelfExternals.php
@@ -51,4 +51,4 @@ class DeleteSelfExternals extends Maintenance {
 }
 
 $maintClass = "DeleteSelfExternals";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index 59f5042..e930cc6 100644 (file)
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -26,20 +26,21 @@
  * @ingroup Maintenance
  */
 
-if ( !defined( 'DO_MAINTENANCE' ) ) {
+if ( !defined( 'RUN_MAINTENANCE_IF_MAIN' ) ) {
        echo "This file must be included after Maintenance.php\n";
        exit( 1 );
 }
 
+// Wasn't included from the file scope, halt execution (probably wanted the class)
+if( !Maintenance::shouldExecute() ) {
+       return;
+}
+
 if ( !$maintClass || !class_exists( $maintClass ) ) {
        echo "\$maintClass is not set or is set to a non-existent class.\n";
        exit( 1 );
 }
 
-if ( defined( 'MW_NO_SETUP' ) ) {
-       return;
-}
-
 // Get an object to start us off
 $maintenance = new $maintClass();
 

diff --git a/maintenance/dumpInterwiki.php b/maintenance/dumpInterwiki.php
index 3c690a9..e92a3ea 100644 (file)
--- a/maintenance/dumpInterwiki.php
+++ b/maintenance/dumpInterwiki.php
@@ -250,5 +250,5 @@ class DumpInterwiki extends Maintenance {
 }
 
 $maintClass = "DumpInterwiki";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
 

diff --git a/maintenance/dumpLinks.php b/maintenance/dumpLinks.php
index a6049d8..39a9e95 100644 (file)
--- a/maintenance/dumpLinks.php
+++ b/maintenance/dumpLinks.php
@@ -69,5 +69,5 @@ class DumpLinks extends Maintenance {
 }
 
 $maintClass = "DumpLinks";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
 

diff --git a/maintenance/dumpSisterSites.php b/maintenance/dumpSisterSites.php
index ce931ac..f5abcd1 100644 (file)
--- a/maintenance/dumpSisterSites.php
+++ b/maintenance/dumpSisterSites.php
@@ -52,4 +52,4 @@ class DumpSisterSites extends Maintenance {
 }
 
 $maintClass = "DumpSisterSites";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/dumpUploads.php b/maintenance/dumpUploads.php
index 0db4be3..74c0cb0 100644 (file)
--- a/maintenance/dumpUploads.php
+++ b/maintenance/dumpUploads.php
@@ -118,4 +118,4 @@ By default, outputs relative paths against the parent directory of \$wgUploadDir
 }
 
 $maintClass = "UploadDumper";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/edit.php b/maintenance/edit.php
index 30dfee1..0e82426 100644 (file)
--- a/maintenance/edit.php
+++ b/maintenance/edit.php
@@ -85,5 +85,5 @@ class EditCLI extends Maintenance {
 }
 
 $maintClass = "EditCLI";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
 

diff --git a/maintenance/fetchText.php b/maintenance/fetchText.php
index ed2778b..ea56535 100644 (file)
--- a/maintenance/fetchText.php
+++ b/maintenance/fetchText.php
@@ -81,4 +81,4 @@ class FetchText extends Maintenance {
 }
 
 $maintClass = "FetchText";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/findhooks.php b/maintenance/findhooks.php
index 8ea00d1..28add41 100644 (file)
--- a/maintenance/findhooks.php
+++ b/maintenance/findhooks.php
@@ -211,4 +211,4 @@ class FindHooks extends Maintenance {
 }
 
 $maintClass = "FindHooks";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/fixSlaveDesync.php b/maintenance/fixSlaveDesync.php
index 4320be5..fe89294 100644 (file)
--- a/maintenance/fixSlaveDesync.php
+++ b/maintenance/fixSlaveDesync.php
@@ -204,4 +204,4 @@ class FixSlaveDesync extends Maintenance {
 }
 
 $maintClass = "FixSlaveDesync";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/fixTimestamps.php b/maintenance/fixTimestamps.php
index 0c1adba..3e3bd0a 100644 (file)
--- a/maintenance/fixTimestamps.php
+++ b/maintenance/fixTimestamps.php
@@ -118,4 +118,4 @@ class FixTimestamps extends Maintenance {
 }
 
 $maintClass = "FixTimestamps";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/fixUserRegistration.php b/maintenance/fixUserRegistration.php
index 8091c7a..d4ff7c2 100644 (file)
--- a/maintenance/fixUserRegistration.php
+++ b/maintenance/fixUserRegistration.php
@@ -52,4 +52,4 @@ class FixUserRegistration extends Maintenance {
 }
 
 $maintClass = "FixUserRegistration";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/generateSitemap.php b/maintenance/generateSitemap.php
index f68b3aa..a6527bd 100644 (file)
--- a/maintenance/generateSitemap.php
+++ b/maintenance/generateSitemap.php
@@ -453,4 +453,4 @@ class GenerateSitemap extends Maintenance {
 }
 
 $maintClass = "GenerateSitemap";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/getLagTimes.php b/maintenance/getLagTimes.php
index ab2c2aa..0322fa2 100644 (file)
--- a/maintenance/getLagTimes.php
+++ b/maintenance/getLagTimes.php
@@ -51,4 +51,4 @@ class GetLagTimes extends Maintenance {
 }
 
 $maintClass = "GetLagTimes";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/getSlaveServer.php b/maintenance/getSlaveServer.php
index 755659a..a9d93f1 100644 (file)
--- a/maintenance/getSlaveServer.php
+++ b/maintenance/getSlaveServer.php
@@ -47,4 +47,4 @@ class GetSlaveServer extends Maintenance {
 }
 
 $maintClass = "GetSlaveServer";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/getText.php b/maintenance/getText.php
index b05c6f4..eb04411 100644 (file)
--- a/maintenance/getText.php
+++ b/maintenance/getText.php
@@ -55,4 +55,4 @@ class GetTextMaint extends Maintenance {
 }
 
 $maintClass = "GetTextMaint";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/httpSessionDownload.php b/maintenance/httpSessionDownload.php
index 9b26fe1..3c4f16a 100644 (file)
--- a/maintenance/httpSessionDownload.php
+++ b/maintenance/httpSessionDownload.php
@@ -54,4 +54,4 @@ class HttpSessionDownload extends Maintenance {
 }
 
 $maintClass = "HttpSessionDownload";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/importUseModWikipedia.php b/maintenance/importUseModWikipedia.php
index 618fbae..a14c4f4 100644 (file)
--- a/maintenance/importUseModWikipedia.php
+++ b/maintenance/importUseModWikipedia.php
@@ -891,4 +891,4 @@ EOT
 }
 
 $maintClass = 'ImportUseModWikipedia';
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/initEditCount.php b/maintenance/initEditCount.php
index 289315d..e421e29 100644 (file)
--- a/maintenance/initEditCount.php
+++ b/maintenance/initEditCount.php
@@ -107,4 +107,4 @@ in the load balancer, usually indicating a replication environment.' );
 }
 
 $maintClass = "InitEditCount";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/initStats.php b/maintenance/initStats.php
index 9dd2721..1ec5c92 100644 (file)
--- a/maintenance/initStats.php
+++ b/maintenance/initStats.php
@@ -80,4 +80,4 @@ class InitStats extends Maintenance {
 }
 
 $maintClass = "InitStats";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/install.php b/maintenance/install.php
index fb509cf..09a7638 100644 (file)
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -90,4 +90,4 @@ class CommandLineInstaller extends Maintenance {
 
 $maintClass = "CommandLineInstaller";
 
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/lag.php b/maintenance/lag.php
index df1cf70..dc8bff5 100644 (file)
--- a/maintenance/lag.php
+++ b/maintenance/lag.php
@@ -63,4 +63,4 @@ class DatabaseLag extends Maintenance {
 }
 
 $maintClass = "DatabaseLag";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/language/alltrans.php b/maintenance/language/alltrans.php
index d224e9f..f872e6a 100644 (file)
--- a/maintenance/language/alltrans.php
+++ b/maintenance/language/alltrans.php
@@ -37,4 +37,4 @@ class AllTrans extends Maintenance {
 }
 
 $maintClass = "AllTrans";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/language/countMessages.php b/maintenance/language/countMessages.php
index a8a7f7c..f949ddc 100644 (file)
--- a/maintenance/language/countMessages.php
+++ b/maintenance/language/countMessages.php
@@ -62,4 +62,4 @@ class CountMessages extends Maintenance {
 }
 
 $maintClass = "CountMessages";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/language/date-formats.php b/maintenance/language/date-formats.php
index 32a923e..04f5e8b 100644 (file)
--- a/maintenance/language/date-formats.php
+++ b/maintenance/language/date-formats.php
@@ -73,4 +73,4 @@ class DateFormats extends Maintenance {
 }
 
 $maintClass = "DateFormats";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/language/digit2html.php b/maintenance/language/digit2html.php
index de99c36..a80ac01 100644 (file)
--- a/maintenance/language/digit2html.php
+++ b/maintenance/language/digit2html.php
@@ -58,4 +58,4 @@ class Digit2Html extends Maintenance {
 }
 
 $maintClass = "Digit2Html";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/language/dumpMessages.php b/maintenance/language/dumpMessages.php
index e676ce7..9bdda09 100644 (file)
--- a/maintenance/language/dumpMessages.php
+++ b/maintenance/language/dumpMessages.php
@@ -43,4 +43,4 @@ class DumpMessages extends Maintenance {
 }
 
 $maintClass = "DumpMessages";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/language/generateNormalizerData.php b/maintenance/language/generateNormalizerData.php
index be0b327..a958abf 100644 (file)
--- a/maintenance/language/generateNormalizerData.php
+++ b/maintenance/language/generateNormalizerData.php
@@ -154,5 +154,5 @@ class GenerateNormalizerData extends Maintenance {
 }
 
 $maintClass = 'GenerateNormalizerData';
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
 

diff --git a/maintenance/language/lang2po.php b/maintenance/language/lang2po.php
index 7d1421e..7e5dc47 100644 (file)
--- a/maintenance/language/lang2po.php
+++ b/maintenance/language/lang2po.php
@@ -163,4 +163,4 @@ msgstr ""
 }
 
 $maintClass = "Lang2Po";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/language/langmemusage.php b/maintenance/language/langmemusage.php
index 40391cc..28fe120 100644 (file)
--- a/maintenance/language/langmemusage.php
+++ b/maintenance/language/langmemusage.php
@@ -56,4 +56,4 @@ class LangMemUsage extends Maintenance {
 }
 
 $maintClass = "LangMemUsage";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/mctest.php b/maintenance/mctest.php
index edc1d4a..651b295 100644 (file)
--- a/maintenance/mctest.php
+++ b/maintenance/mctest.php
@@ -80,4 +80,4 @@ class mcTest extends Maintenance {
 }
 
 $maintClass = "mcTest";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index a914202..994f9bb 100644 (file)
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -55,7 +55,7 @@ class MergeMessageFileList extends Maintenance {
        }
 }
 
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
 
 foreach ( $mmfl['setupFiles'] as $fileName ) {
        if ( strval( $fileName ) === '' ) {

diff --git a/maintenance/migrateUserGroup.php b/maintenance/migrateUserGroup.php
index 4dfdad1..c416320 100644 (file)
--- a/maintenance/migrateUserGroup.php
+++ b/maintenance/migrateUserGroup.php
@@ -67,4 +67,4 @@ class MigrateUserGroup extends Maintenance {
 }
 
 $maintClass = "MigrateUserGroup";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/minify.php b/maintenance/minify.php
index 37818d6..e56e634 100644 (file)
--- a/maintenance/minify.php
+++ b/maintenance/minify.php
@@ -128,4 +128,4 @@ class MinifyScript extends Maintenance {
 }
 
 $maintClass = 'MinifyScript';
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/moveBatch.php b/maintenance/moveBatch.php
index 4bfe4a4..c749533 100644 (file)
--- a/maintenance/moveBatch.php
+++ b/maintenance/moveBatch.php
@@ -107,4 +107,4 @@ class MoveBatch extends Maintenance {
 }
 
 $maintClass = "MoveBatch";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index a9fa8c1..dbb16bc 100644 (file)
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -307,4 +307,4 @@ class NamespaceConflictChecker extends Maintenance {
 }
 
 $maintClass = "NamespaceConflictChecker";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/nextJobDB.php b/maintenance/nextJobDB.php
index 7f6aa40..8d8229e 100644 (file)
--- a/maintenance/nextJobDB.php
+++ b/maintenance/nextJobDB.php
@@ -100,4 +100,4 @@ class nextJobDB extends Maintenance {
 }
 
 $maintClass = "nextJobDb";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/nukeNS.php b/maintenance/nukeNS.php
index 9de3a37..c89fa94 100644 (file)
--- a/maintenance/nukeNS.php
+++ b/maintenance/nukeNS.php
@@ -111,4 +111,4 @@ class NukeNS extends Maintenance {
 }
 
 $maintClass = "NukeNS";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/nukePage.php b/maintenance/nukePage.php
index 1057ea9..4a073a5 100644 (file)
--- a/maintenance/nukePage.php
+++ b/maintenance/nukePage.php
@@ -110,4 +110,4 @@ class NukePage extends Maintenance {
 }
 
 $maintClass = "NukePage";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/orphans.php b/maintenance/orphans.php
index 46b9b27..dbbddb9 100644 (file)
--- a/maintenance/orphans.php
+++ b/maintenance/orphans.php
@@ -231,4 +231,4 @@ class Orphans extends Maintenance {
 }
 
 $maintClass = "Orphans";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/patchSql.php b/maintenance/patchSql.php
index 9c59d6a..1f96d62 100644 (file)
--- a/maintenance/patchSql.php
+++ b/maintenance/patchSql.php
@@ -56,4 +56,4 @@ class PatchSql extends Maintenance {
 }
 
 $maintClass = "PatchSql";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/populateCategory.php b/maintenance/populateCategory.php
index 71ba645..ce0765c 100644 (file)
--- a/maintenance/populateCategory.php
+++ b/maintenance/populateCategory.php
@@ -141,4 +141,4 @@ TEXT;
 }
 
 $maintClass = "PopulateCategory";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/populateLogSearch.php b/maintenance/populateLogSearch.php
index 32f5d19..ce2d95c 100644 (file)
--- a/maintenance/populateLogSearch.php
+++ b/maintenance/populateLogSearch.php
@@ -149,4 +149,4 @@ class PopulateLogSearch extends Maintenance {
 }
 
 $maintClass = "PopulateLogSearch";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/populateLogUsertext.php b/maintenance/populateLogUsertext.php
index d3b1dd5..bb3927c 100644 (file)
--- a/maintenance/populateLogUsertext.php
+++ b/maintenance/populateLogUsertext.php
@@ -78,5 +78,5 @@ class PopulateLogUsertext extends Maintenance {
 }
 
 $maintClass = "PopulateLogUsertext";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
 

diff --git a/maintenance/populateParentId.php b/maintenance/populateParentId.php
index 45255b0..387f5a5 100644 (file)
--- a/maintenance/populateParentId.php
+++ b/maintenance/populateParentId.php
@@ -115,4 +115,4 @@ class PopulateParentId extends Maintenance {
 }
 
 $maintClass = "PopulateParentId";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/populateRevisionLength.php b/maintenance/populateRevisionLength.php
index faad442..0af51dc 100644 (file)
--- a/maintenance/populateRevisionLength.php
+++ b/maintenance/populateRevisionLength.php
@@ -95,4 +95,4 @@ class PopulateRevisionLength extends Maintenance {
 }
 
 $maintClass = "PopulateRevisionLength";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/populateSha1.php b/maintenance/populateSha1.php
index 2676409..1714c0d 100644 (file)
--- a/maintenance/populateSha1.php
+++ b/maintenance/populateSha1.php
@@ -96,4 +96,4 @@ class PopulateSha1 extends Maintenance {
 }
 
 $maintClass = "PopulateSha1";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/protect.php b/maintenance/protect.php
index 9143ad9..aab84d6 100644 (file)
--- a/maintenance/protect.php
+++ b/maintenance/protect.php
@@ -68,4 +68,4 @@ class Protect extends Maintenance {
 }
 
 $maintClass = "Protect";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/purgeList.php b/maintenance/purgeList.php
index f5f89a1..2ae4b22 100644 (file)
--- a/maintenance/purgeList.php
+++ b/maintenance/purgeList.php
@@ -61,4 +61,4 @@ class PurgeList extends Maintenance {
 }
 
 $maintClass = "PurgeList";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/purgeOldText.php b/maintenance/purgeOldText.php
index 4e2a927..0cbc724 100644 (file)
--- a/maintenance/purgeOldText.php
+++ b/maintenance/purgeOldText.php
@@ -36,4 +36,4 @@ class PurgeOldText extends Maintenance {
 }
 
 $maintClass = "PurgeOldText";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/reassignEdits.php b/maintenance/reassignEdits.php
index 100f4b9..039422b 100644 (file)
--- a/maintenance/reassignEdits.php
+++ b/maintenance/reassignEdits.php
@@ -169,5 +169,5 @@ class ReassignEdits extends Maintenance {
 }
 
 $maintClass = "ReassignEdits";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
 

diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php
index ff059d8..841bbcd 100644 (file)
--- a/maintenance/rebuildFileCache.php
+++ b/maintenance/rebuildFileCache.php
@@ -122,4 +122,4 @@ class RebuildFileCache extends Maintenance {
 }
 
 $maintClass = "RebuildFileCache";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/rebuildImages.php b/maintenance/rebuildImages.php
index 8fbeb1c..1848b10 100644 (file)
--- a/maintenance/rebuildImages.php
+++ b/maintenance/rebuildImages.php
@@ -209,4 +209,4 @@ class ImageBuilder extends Maintenance {
 }
 
 $maintClass = 'ImageBuilder';
-require( DO_MAINTENANCE );
+require( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/rebuildInterwiki.php b/maintenance/rebuildInterwiki.php
index 5180a20..5bb4f4b 100644 (file)
--- a/maintenance/rebuildInterwiki.php
+++ b/maintenance/rebuildInterwiki.php
@@ -288,5 +288,5 @@ class RebuildInterwiki extends Maintenance {
 }
 
 $maintClass = "RebuildInterwiki";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
 

diff --git a/maintenance/rebuildLocalisationCache.php b/maintenance/rebuildLocalisationCache.php
index 9733457..0ca9961 100644 (file)
--- a/maintenance/rebuildLocalisationCache.php
+++ b/maintenance/rebuildLocalisationCache.php
@@ -130,4 +130,4 @@ class RebuildLocalisationCache extends Maintenance {
 }
 
 $maintClass = "RebuildLocalisationCache";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/rebuildall.php b/maintenance/rebuildall.php
index 3d2aebc..dbbed86 100644 (file)
--- a/maintenance/rebuildall.php
+++ b/maintenance/rebuildall.php
@@ -52,4 +52,4 @@ class RebuildAll extends Maintenance {
 }
 
 $maintClass = "RebuildAll";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/rebuildmessages.php b/maintenance/rebuildmessages.php
index 335d534..de37da7 100644 (file)
--- a/maintenance/rebuildmessages.php
+++ b/maintenance/rebuildmessages.php
@@ -47,4 +47,4 @@ class RebuildMessages extends Maintenance {
 }
 
 $maintClass = "RebuildMessages";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/rebuildrecentchanges.php b/maintenance/rebuildrecentchanges.php
index 1f3e0a8..8964d1a 100644 (file)
--- a/maintenance/rebuildrecentchanges.php
+++ b/maintenance/rebuildrecentchanges.php
@@ -294,4 +294,4 @@ class RebuildRecentchanges extends Maintenance {
 }
 
 $maintClass = "RebuildRecentchanges";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/rebuildtextindex.php b/maintenance/rebuildtextindex.php
index 6c400bd..deabff7 100644 (file)
--- a/maintenance/rebuildtextindex.php
+++ b/maintenance/rebuildtextindex.php
@@ -137,4 +137,4 @@ class RebuildTextIndex extends Maintenance {
 }
 
 $maintClass = "RebuildTextIndex";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/refreshImageCount.php b/maintenance/refreshImageCount.php
index 2a1890d..f9bdeea 100644 (file)
--- a/maintenance/refreshImageCount.php
+++ b/maintenance/refreshImageCount.php
@@ -50,5 +50,5 @@ class RefreshImageCount extends Maintenance {
 }
 
 $maintClass = "RefreshImageCount";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
 

diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php
index 34fcbfb..7c22644 100644 (file)
--- a/maintenance/refreshLinks.php
+++ b/maintenance/refreshLinks.php
@@ -279,4 +279,4 @@ class RefreshLinks extends Maintenance {
 }
 
 $maintClass = 'RefreshLinks';
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/removeUnusedAccounts.php b/maintenance/removeUnusedAccounts.php
index 5be1b59..44c27b3 100644 (file)
--- a/maintenance/removeUnusedAccounts.php
+++ b/maintenance/removeUnusedAccounts.php
@@ -107,4 +107,4 @@ class RemoveUnusedAccounts extends Maintenance {
 }
 
 $maintClass = "RemoveUnusedAccounts";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/renameDbPrefix.php b/maintenance/renameDbPrefix.php
index adeb540..dd09362 100644 (file)
--- a/maintenance/renameDbPrefix.php
+++ b/maintenance/renameDbPrefix.php
@@ -84,4 +84,4 @@ class RenameDbPrefix extends Maintenance {
 }
 
 $maintClass = "RenameDbPrefix";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/renamewiki.php b/maintenance/renamewiki.php
index 3cd5099..338c45f 100644 (file)
--- a/maintenance/renamewiki.php
+++ b/maintenance/renamewiki.php
@@ -86,4 +86,4 @@ class RenameWiki extends Maintenance {
 }
 
 $maintClass = "RenameWiki";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/renderDump.php b/maintenance/renderDump.php
index 4eae473..78c5b6f 100644 (file)
--- a/maintenance/renderDump.php
+++ b/maintenance/renderDump.php
@@ -115,4 +115,4 @@ class DumpRenderer extends Maintenance {
 }
 
 $maintClass = "DumpRenderer";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/rollbackEdits.php b/maintenance/rollbackEdits.php
index 2be0566..e1c126e 100644 (file)
--- a/maintenance/rollbackEdits.php
+++ b/maintenance/rollbackEdits.php
@@ -94,4 +94,4 @@ class RollbackEdits extends Maintenance {
 }
 
 $maintClass = 'RollbackEdits';
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/runBatchedQuery.php b/maintenance/runBatchedQuery.php
index 970b392..dd3680c 100644 (file)
--- a/maintenance/runBatchedQuery.php
+++ b/maintenance/runBatchedQuery.php
@@ -57,4 +57,4 @@ class BatchedQueryRunner extends Maintenance {
 
 
 $maintClass = "BatchedQueryRunner";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php
index d4916c3..a100034 100644 (file)
--- a/maintenance/runJobs.php
+++ b/maintenance/runJobs.php
@@ -122,4 +122,4 @@ class RunJobs extends Maintenance {
 }
 
 $maintClass = "RunJobs";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/showJobs.php b/maintenance/showJobs.php
index 1a2dc42..886d7d4 100644 (file)
--- a/maintenance/showJobs.php
+++ b/maintenance/showJobs.php
@@ -52,4 +52,4 @@ class ShowJobs extends Maintenance {
 }
 
 $maintClass = "ShowJobs";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/showStats.php b/maintenance/showStats.php
index 8daf507..b5e8525 100644 (file)
--- a/maintenance/showStats.php
+++ b/maintenance/showStats.php
@@ -64,5 +64,5 @@ class ShowStats extends Maintenance {
 }
 
 $maintClass = "ShowStats";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
 

diff --git a/maintenance/sql.php b/maintenance/sql.php
index e601f88..e1f2bb5 100644 (file)
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -90,4 +90,4 @@ class SqlPromptPrinter {
 }
 
 $maintClass = "MwSql";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/sqlite.php b/maintenance/sqlite.php
index e46b8e7..4cd225d 100644 (file)
--- a/maintenance/sqlite.php
+++ b/maintenance/sqlite.php
@@ -128,4 +128,4 @@ class SqliteMaintenance extends Maintenance {
 }
 
 $maintClass = "SqliteMaintenance";
-require_once( DO_MAINTENANCE );
\ No newline at end of file
+require_once( RUN_MAINTENANCE_IF_MAIN );
\ No newline at end of file

diff --git a/maintenance/stats.php b/maintenance/stats.php
index 8854d19..2cbbcf9 100644 (file)
--- a/maintenance/stats.php
+++ b/maintenance/stats.php
@@ -87,4 +87,4 @@ class CacheStats extends Maintenance {
 }
 
 $maintClass = "CacheStats";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/storage/dumpRev.php b/maintenance/storage/dumpRev.php
index db460b2..b200d8a 100644 (file)
--- a/maintenance/storage/dumpRev.php
+++ b/maintenance/storage/dumpRev.php
@@ -76,4 +76,4 @@ class DumpRev extends Maintenance {
 }
 
 $maintClass = "DumpRev";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/storage/fixBug20757.php b/maintenance/storage/fixBug20757.php
index 9582949..d04a24f 100644 (file)
--- a/maintenance/storage/fixBug20757.php
+++ b/maintenance/storage/fixBug20757.php
@@ -340,5 +340,5 @@ class FixBug20757 extends Maintenance {
 }
 
 $maintClass = 'FixBug20757';
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
 

diff --git a/maintenance/storage/orphanStats.php b/maintenance/storage/orphanStats.php
index 55677e8..f30f07e 100644 (file)
--- a/maintenance/storage/orphanStats.php
+++ b/maintenance/storage/orphanStats.php
@@ -67,4 +67,4 @@ class OrphanStats extends Maintenance {
 }
 
 $maintClass = "OrphanStats";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/storage/storageTypeStats.php b/maintenance/storage/storageTypeStats.php
index dfa8f51..817659f 100644 (file)
--- a/maintenance/storage/storageTypeStats.php
+++ b/maintenance/storage/storageTypeStats.php
@@ -112,5 +112,5 @@ SQL;
 }
 
 $maintClass = 'StorageTypeStats';
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
 

diff --git a/maintenance/undelete.php b/maintenance/undelete.php
index 721ef07..f7ea2a2 100644 (file)
--- a/maintenance/undelete.php
+++ b/maintenance/undelete.php
@@ -52,4 +52,4 @@ class Undelete extends Maintenance {
 }
 
 $maintClass = "Undelete";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/update.php b/maintenance/update.php
index 4cb2194..9c42b44 100644 (file)
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -131,4 +131,4 @@ class UpdateMediaWiki extends Maintenance {
 }
 
 $maintClass = 'UpdateMediaWiki';
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/updateArticleCount.php b/maintenance/updateArticleCount.php
index 636d9fc..b0dceb5 100644 (file)
--- a/maintenance/updateArticleCount.php
+++ b/maintenance/updateArticleCount.php
@@ -98,4 +98,4 @@ class UpdateArticleCount extends Maintenance {
 }
 
 $maintClass = "UpdateArticleCount";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php
index 0a173cd..67b6b10 100644 (file)
--- a/maintenance/updateCollation.php
+++ b/maintenance/updateCollation.php
@@ -125,4 +125,4 @@ TEXT;
 }
 
 $maintClass = "UpdateCollation";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/updateDoubleWidthSearch.php b/maintenance/updateDoubleWidthSearch.php
index b187880..61545f8 100644 (file)
--- a/maintenance/updateDoubleWidthSearch.php
+++ b/maintenance/updateDoubleWidthSearch.php
@@ -67,4 +67,4 @@ class UpdateDoubleWidthSearch extends Maintenance {
 }
 
 $maintClass = "UpdateDoubleWidthSearch";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/updateRestrictions.php b/maintenance/updateRestrictions.php
index 23d8aa2..c815f4b 100644 (file)
--- a/maintenance/updateRestrictions.php
+++ b/maintenance/updateRestrictions.php
@@ -108,4 +108,4 @@ class UpdateRestrictions extends Maintenance {
 }
 
 $maintClass = "UpdateRestrictions";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/updateSearchIndex.php b/maintenance/updateSearchIndex.php
index 6de3ced..c73b465 100644 (file)
--- a/maintenance/updateSearchIndex.php
+++ b/maintenance/updateSearchIndex.php
@@ -119,4 +119,4 @@ class UpdateSearchIndex extends Maintenance {
 }
 
 $maintClass = "UpdateSearchIndex";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/updateSpecialPages.php b/maintenance/updateSpecialPages.php
index 5d6c3f5..335a2b2 100644 (file)
--- a/maintenance/updateSpecialPages.php
+++ b/maintenance/updateSpecialPages.php
@@ -140,4 +140,4 @@ class UpdateSpecialPages extends Maintenance {
 }
 
 $maintClass = "UpdateSpecialPages";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/upgrade1_5.php b/maintenance/upgrade1_5.php
index 0b2836c..22fab70 100644 (file)
--- a/maintenance/upgrade1_5.php
+++ b/maintenance/upgrade1_5.php
@@ -1325,4 +1325,4 @@ END
 }
 
 $maintClass = 'FiveUpgrade';
-require( DO_MAINTENANCE );
+require( RUN_MAINTENANCE_IF_MAIN );

diff --git a/maintenance/waitForSlave.php b/maintenance/waitForSlave.php
index 40a4bd7..720ca28 100644 (file)
--- a/maintenance/waitForSlave.php
+++ b/maintenance/waitForSlave.php
@@ -34,4 +34,4 @@ class WaitForSlave extends Maintenance {
 }
 
 $maintClass = "WaitForSlave";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );

diff --git a/tests/RunSeleniumTests.php b/tests/RunSeleniumTests.php
index ffa14db..e9270a8 100644 (file)
--- a/tests/RunSeleniumTests.php
+++ b/tests/RunSeleniumTests.php
@@ -230,4 +230,4 @@ class SeleniumTester extends Maintenance {
 
 $maintClass = "SeleniumTester";
 
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );