From: Antoine Musso <hashar@users.mediawiki.org>
Date: Tue, 28 Sep 2010 18:44:25 +0000 (+0000)
Subject: Rewrite messenging for old message deletion. The old one is boring.
X-Git-Tag: 1.31.0-rc.0~34755
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=841adbaedfd9bf5cc1ecf02a3adc2da7a658332a;p=lhc%2Fweb%2Fwiklou.git

Rewrite messenging for old message deletion. The old one is boring.
---

diff --git a/maintenance/deleteDefaultMessages.php b/maintenance/deleteDefaultMessages.php
index b79b2dd23d..741773fe73 100644
--- a/maintenance/deleteDefaultMessages.php
+++ b/maintenance/deleteDefaultMessages.php
@@ -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,6 +46,20 @@ 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 );
+		$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 ) {