Fix non reverted job_insert_timestamp

[lhc/web/wiklou.git] / maintenance / deleteDefaultMessages.php

diff --git a/maintenance/deleteDefaultMessages.php b/maintenance/deleteDefaultMessages.php
index ca10362..21d7755 100644 (file)
--- a/maintenance/deleteDefaultMessages.php
+++ b/maintenance/deleteDefaultMessages.php
@@ -31,9 +31,7 @@ class DeleteDefaultMessages extends Maintenance {
        }
 
        public function execute() {
-
-               $user = 'MediaWiki default';
-               $reason = 'No longer required';
+               global $wgUser;
 
                $this->output( "Checking existence of old default messages..." );
                $dbr = wfGetDB( DB_SLAVE );
@@ -54,23 +52,25 @@ class DeleteDefaultMessages extends Maintenance {
 
                # Deletions will be made by $user temporarly added to the bot group
                # in order to hide it in RecentChanges.
-               global $wgUser;
-               $wgUser = User::newFromName( $user );
-               $wgUser->addGroup( 'bot' );
+               $user = User::newFromName( 'MediaWiki default' );
+               if ( !$user ) {
+                       $this->error( "Invalid username", true );
+               }
+               $user->addGroup( 'bot' );
+               $wgUser = $user;
 
                # Handle deletion
                $this->output( "\n...deleting old default messages (this may take a long time!)...", 'msg' );
                $dbw = wfGetDB( DB_MASTER );
 
                foreach ( $res as $row ) {
-                       if ( function_exists( 'wfWaitForSlaves' ) ) {
-                               wfWaitForSlaves( 5 );
-                       }
+                       wfWaitForSlaves();
                        $dbw->ping();
                        $title = Title::makeTitle( $row->page_namespace, $row->page_title );
-                       $article = new Article( $title );
+                       $page = WikiPage::factory( $title );
                        $dbw->begin();
-                       $article->doDeleteArticle( $reason );
+                       $error = ''; // Passed by ref
+                       $page->doDeleteArticle( 'No longer required', false, 0, false, $error, $user );
                        $dbw->commit();
                }
 
@@ -79,4 +79,4 @@ class DeleteDefaultMessages extends Maintenance {
 }
 
 $maintClass = "DeleteDefaultMessages";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );