From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Dec 2013 09:55:49 +0100
Subject: Update to MediaWiki 1.22.0

---
 maintenance/deleteEqualMessages.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'maintenance/deleteEqualMessages.php')

diff --git a/maintenance/deleteEqualMessages.php b/maintenance/deleteEqualMessages.php
index 7048140b..81758913 100644
--- a/maintenance/deleteEqualMessages.php
+++ b/maintenance/deleteEqualMessages.php
@@ -19,7 +19,7 @@
  * @ingroup Maintenance
  */
 
-require_once( __DIR__ . '/Maintenance.php' );
+require_once __DIR__ . '/Maintenance.php';
 
 /**
  * Maintenance script that deletes all pages in the MediaWiki namespace
@@ -41,7 +41,7 @@ class DeleteEqualMessages extends Maintenance {
 	 * @param string|bool $langCode See --lang-code option.
 	 */
 	protected function fetchMessageInfo( $langCode, array &$messageInfo ) {
-		global $wgUser, $wgContLang;
+		global $wgContLang;
 
 		if ( $langCode ) {
 			$this->output( "\n... fetching message info for language: $langCode" );
@@ -70,7 +70,13 @@ class DeleteEqualMessages extends Maintenance {
 				$default = wfMessage( $key )->inLanguage( $langCode )->useDatabase( false )->plain();
 
 				$messageInfo['relevantPages']++;
-				if ( $actual === $default ) {
+
+				if (
+					// Exclude messages that are empty by default, such as sitenotice, specialpage
+					// summaries and accesskeys.
+					$default !== '' && $default !== '-' &&
+						$actual === $default
+				) {
 					$hasTalk = isset( $statuses['talks'][$key] );
 					$messageInfo['results'][] = array(
 						'title' => $key . $titleSuffix,
@@ -152,6 +158,7 @@ class DeleteEqualMessages extends Maintenance {
 		if ( !$user ) {
 			$this->error( "Invalid username", true );
 		}
+		global $wgUser;
 		$wgUser = $user;
 
 		// Hide deletions from RecentChanges
@@ -183,4 +190,4 @@ class DeleteEqualMessages extends Maintenance {
 }
 
 $maintClass = "DeleteEqualMessages";
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;
-- 
cgit v1.2.3-54-g00ecf