X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FdeleteEqualMessages.php;h=478e0d70c0ca4193963216e742fb2b68249212e0;hb=d92845c2295d982c80312880c3fae788450676ea;hp=1a54df1ea57c76b5df44e401133875beb85cc643;hpb=d5884183f4de9db480e11422b59716c5560b90fc;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/deleteEqualMessages.php b/maintenance/deleteEqualMessages.php
index 1a54df1ea5..478e0d70c0 100644
--- a/maintenance/deleteEqualMessages.php
+++ b/maintenance/deleteEqualMessages.php
@@ -30,15 +30,18 @@ require_once __DIR__ . '/Maintenance.php';
 class DeleteEqualMessages extends Maintenance {
 	public function __construct() {
 		parent::__construct();
-		$this->mDescription = "Deletes all pages in the MediaWiki namespace that are equal to the default message";
+		$this->mDescription = 'Deletes all pages in the MediaWiki namespace that are equal to '
+			. 'the default message';
 		$this->addOption( 'delete', 'Actually delete the pages (default: dry run)' );
 		$this->addOption( 'delete-talk', 'Don\'t leave orphaned talk pages behind during deletion' );
-		$this->addOption( 'lang-code', 'Check for subpages of this language code (default: root page against content language). ' .
-			'Use value "*" to run for all mwfile language code subpages (including the base pages that override content language).', false, true );
+		$this->addOption( 'lang-code', 'Check for subpages of this language code (default: root '
+			. 'page against content language). Use value "*" to run for all mwfile language code '
+			. 'subpages (including the base pages that override content language).', false, true );
 	}
 
 	/**
 	 * @param string|bool $langCode See --lang-code option.
+	 * @param array &$messageInfo
 	 */
 	protected function fetchMessageInfo( $langCode, array &$messageInfo ) {
 		global $wgContLang;
@@ -59,7 +62,8 @@ class DeleteEqualMessages extends Maintenance {
 		// Normalise message names for NS_MEDIAWIKI page_title
 		$messageNames = array_map( array( $wgContLang, 'ucfirst' ), $messageNames );
 
-		$statuses = AllmessagesTablePager::getCustomisedStatuses( $messageNames, $langCode, $nonContLang );
+		$statuses = AllMessagesTablePager::getCustomisedStatuses(
+			$messageNames, $langCode, $nonContLang );
 		// getCustomisedStatuses is stripping the sub page from the page titles, add it back
 		$titleSuffix = $nonContLang ? "/$langCode" : '';
 
@@ -134,8 +138,10 @@ class DeleteEqualMessages extends Maintenance {
 			return;
 		}
 
-		$this->output( "\n{$messageInfo['relevantPages']} pages in the MediaWiki namespace override messages." );
-		$this->output( "\n{$messageInfo['equalPages']} pages are equal to the default message (+ {$messageInfo['equalPagesTalks']} talk pages).\n" );
+		$this->output( "\n{$messageInfo['relevantPages']} pages in the MediaWiki namespace "
+			. "override messages." );
+		$this->output( "\n{$messageInfo['equalPages']} pages are equal to the default message "
+			. "(+ {$messageInfo['equalPagesTalks']} talk pages).\n" );
 
 		if ( !$doDelete ) {
 			$list = '';
@@ -176,13 +182,20 @@ class DeleteEqualMessages extends Maintenance {
 			$this->output( "\n* [[$title]]" );
 			$page = WikiPage::factory( $title );
 			$error = ''; // Passed by ref
-			$page->doDeleteArticle( 'No longer required', false, 0, false, $error, $user );
+			$success = $page->doDeleteArticle( 'No longer required', false, 0, true, $error, $user );
+			if ( !$success ) {
+				$this->output( " (Failed!)" );
+			}
 			if ( $result['hasTalk'] && $doDeleteTalk ) {
 				$title = Title::makeTitle( NS_MEDIAWIKI_TALK, $result['title'] );
 				$this->output( "\n* [[$title]]" );
 				$page = WikiPage::factory( $title );
 				$error = ''; // Passed by ref
-				$page->doDeleteArticle( 'Orphaned talk page of no longer required message', false, 0, false, $error, $user );
+				$success = $page->doDeleteArticle( 'Orphaned talk page of no longer required message',
+					false, 0, true, $error, $user );
+				if ( !$success ) {
+					$this->output( " (Failed!)" );
+				}
 			}
 		}
 		$this->output( "\n\ndone!\n" );