From 756059829e953641991e364c865ca9bba4b57371 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Sun, 2 Aug 2009 20:21:12 +0000 Subject: [PATCH] Forgot that updaters.inc relies on deleteDefaultMessages.php. Move its require down to where its actually needed, and define MW_NO_SETUP so we don't try to kick it off like normal. Stupid hack until update.php uses Maintenance.php. --- maintenance/deleteDefaultMessages.php | 6 +++++- maintenance/updaters.inc | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/maintenance/deleteDefaultMessages.php b/maintenance/deleteDefaultMessages.php index 93bd6e89fe..305eb419a0 100644 --- 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 0d5975a95d..354ef449d7 100644 --- 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(); -- 2.20.1