Index: trunk/phase3/maintenance/updaters.inc |
— | — | @@ -11,7 +11,6 @@ |
12 | 12 | |
13 | 13 | require_once 'convertLinks.inc'; |
14 | 14 | require_once 'userDupes.inc'; |
15 | | -require_once 'deleteDefaultMessages.php'; |
16 | 15 | # Extension updates |
17 | 16 | require_once( "$IP/includes/Hooks.php" ); |
18 | 17 | |
— | — | @@ -1113,7 +1112,11 @@ |
1114 | 1113 | |
1115 | 1114 | |
1116 | 1115 | wfOut( "Deleting old default messages (this may take a long time!)..." ); |
1117 | | - deleteDefaultMessages(); |
| 1116 | + if( !defined( 'MW_NO_SETUP' ) ) { |
| 1117 | + define( 'MW_NO_SETUP', true ); |
| 1118 | + } |
| 1119 | + require_once 'deleteDefaultMessages.php'; |
| 1120 | + DeleteDefaultMessages::reallyExecute(); |
1118 | 1121 | wfOut( "Done\n" ); |
1119 | 1122 | |
1120 | 1123 | do_stats_init(); |
Index: trunk/phase3/maintenance/deleteDefaultMessages.php |
— | — | @@ -31,6 +31,10 @@ |
32 | 32 | } |
33 | 33 | |
34 | 34 | public function execute() { |
| 35 | + self::reallyExecute(); |
| 36 | + } |
| 37 | + |
| 38 | + public static function reallyExecute() { |
35 | 39 | $user = 'MediaWiki default'; |
36 | 40 | $reason = 'No longer required'; |
37 | 41 | |
— | — | @@ -49,7 +53,7 @@ |
50 | 54 | ); |
51 | 55 | |
52 | 56 | $dbw = wfGetDB( DB_MASTER ); |
53 | | - |
| 57 | + |
54 | 58 | while ( $row = $dbr->fetchObject( $res ) ) { |
55 | 59 | if ( function_exists( 'wfWaitForSlaves' ) ) { |
56 | 60 | wfWaitForSlaves( 5 ); |