Forgot that updaters.inc relies on deleteDefaultMessages.php. Move its require down...

diff --git a/maintenance/deleteDefaultMessages.php b/maintenance/deleteDefaultMessages.php
index 93bd6e8..305eb41 100644 (file)
--- a/maintenance/deleteDefaultMessages.php
+++ b/maintenance/deleteDefaultMessages.php
@@ -31,6 +31,10 @@ class DeleteDefaultMessages extends Maintenance {
        }
 
        public function execute() {
+               self::reallyExecute();
+       }
+       
+       public static function reallyExecute() {
                $user = 'MediaWiki default';
                $reason = 'No longer required';
 
@@ -49,7 +53,7 @@ class DeleteDefaultMessages extends Maintenance {
                );
 
                $dbw = wfGetDB( DB_MASTER );
-       
+
                while ( $row = $dbr->fetchObject( $res ) ) {
                        if ( function_exists( 'wfWaitForSlaves' ) ) {
                                wfWaitForSlaves( 5 );

diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index 0d5975a..354ef44 100644 (file)
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -11,7 +11,6 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 
 require_once 'convertLinks.inc';
 require_once 'userDupes.inc';
-require_once 'deleteDefaultMessages.php';
 # Extension updates
 require_once( "$IP/includes/Hooks.php" );
 
@@ -1113,7 +1112,11 @@ function do_all_updates( $shared = false, $purge = true ) {
 
 
        wfOut( "Deleting old default messages (this may take a long time!)..." ); 
-       deleteDefaultMessages();
+       if( !defined( 'MW_NO_SETUP' ) ) {
+               define( 'MW_NO_SETUP', true );
+       }
+       require_once 'deleteDefaultMessages.php';
+       DeleteDefaultMessages::reallyExecute();
        wfOut( "Done\n" );
        
        do_stats_init();