Merged FileBackend branch. Manually avoiding merging the many prop-only changes SVN...

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

diff --git a/maintenance/deleteDefaultMessages.php b/maintenance/deleteDefaultMessages.php
index b79b2dd..5093871 100644 (file)
--- a/maintenance/deleteDefaultMessages.php
+++ b/maintenance/deleteDefaultMessages.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Deletes all pages in the MediaWiki namespace which were last edited by 
+ * Deletes all pages in the MediaWiki namespace which were last edited by
  * "MediaWiki default".
  *
  * This program is free software; you can redistribute it and/or modify
@@ -32,15 +32,10 @@ class DeleteDefaultMessages extends Maintenance {
 
        public function execute() {
 
-               $this->output( 'Deleting old default messages (this may take a long time!)...', 'msg' );
-
                $user = 'MediaWiki default';
                $reason = 'No longer required';
 
-               global $wgUser;
-               $wgUser = User::newFromName( $user );
-               $wgUser->addGroup( 'bot' );
-
+               $this->output( "Checking existence of old default messages..." );
                $dbr = wfGetDB( DB_SLAVE );
                $res = $dbr->select( array( 'page', 'revision' ),
                        array( 'page_namespace', 'page_title' ),
@@ -51,12 +46,27 @@ class DeleteDefaultMessages extends Maintenance {
                        )
                );
 
+               if( $dbr->numRows( $res ) == 0 ) {
+                       # No more messages left
+                       $this->output( "done.\n" );
+                       return;
+               }
+
+               # 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 );
+               if ( !$wgUser ) {
+                       $this->error( "Invalid username", true );
+               }
+               $wgUser->addGroup( 'bot' );
+
+               # 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 );
@@ -70,4 +80,4 @@ class DeleteDefaultMessages extends Maintenance {
 }
 
 $maintClass = "DeleteDefaultMessages";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );