From cd20fd59951b41358fdbba403ac1dc3899d2a92e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= <matma.rex@gmail.com>
Date: Fri, 8 Nov 2013 21:00:00 +0100
Subject: [PATCH] Remove 'prefsnologin' message, don't use 'watchnologin' where
 inappropriate

There is no reason why the default can't be used instead.
No other special pages requiring login have special messages for the
title, as far as I know.

Left one use of 'watchnologin' in WatchAction alone, since it also uses
another special message there. This message is also currently used by
the MobileFrontend extension.

Change-Id: I7878ed3692358cee1f5785b34ab48a0cc83c05bc
---
 includes/specials/SpecialEditWatchlist.php | 2 +-
 includes/specials/SpecialPreferences.php   | 2 +-
 includes/specials/SpecialWatchlist.php     | 2 +-
 languages/messages/MessagesEn.php          | 1 -
 languages/messages/MessagesQqq.php         | 1 -
 maintenance/dictionary/mediawiki.dic       | 1 -
 maintenance/language/messages.inc          | 1 -
 7 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/includes/specials/SpecialEditWatchlist.php b/includes/specials/SpecialEditWatchlist.php
index e085240e41..daa56b39b4 100644
--- a/includes/specials/SpecialEditWatchlist.php
+++ b/includes/specials/SpecialEditWatchlist.php
@@ -62,7 +62,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 		$this->setHeaders();
 
 		# Anons don't get a watchlist
-		$this->requireLogin( 'watchlistanontext', 'watchnologin' );
+		$this->requireLogin( 'watchlistanontext' );
 
 		$out = $this->getOutput();
 
diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index 5f4b2084f5..51454f69ae 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -37,7 +37,7 @@ class SpecialPreferences extends SpecialPage {
 		$out = $this->getOutput();
 		$out->disallowUserJs(); # Prevent hijacked user scripts from sniffing passwords etc.
 
-		$this->requireLogin( 'prefsnologintext2', 'prefsnologin' );
+		$this->requireLogin( 'prefsnologintext2' );
 		$this->checkReadOnly();
 
 		if ( $par == 'reset' ) {
diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 78216cab6c..9b36209e24 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -41,7 +41,7 @@ class SpecialWatchlist extends SpecialPage {
 		$output = $this->getOutput();
 
 		# Anons don't get a watchlist
-		$this->requireLogin( 'watchlistanontext', 'watchnologin' );
+		$this->requireLogin( 'watchlistanontext' );
 
 		// Check permissions
 		$this->checkPermissions();
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 1ef2d5b1d3..30a24879a2 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1899,7 +1899,6 @@ Note that their indexes of {{SITENAME}} content may be out of date.',
 'preferences-summary'           => '', # do not translate or duplicate this message to other languages
 'mypreferences'                 => 'Preferences',
 'prefs-edits'                   => 'Number of edits:',
-'prefsnologin'                  => 'Not logged in',
 'prefsnologintext2'             => 'Please $1 to set user preferences.',
 'changepassword'                => 'Change password',
 'changepassword-summary'        => '', # do not translate or duplicate this message to other languages
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 032fff2716..f9a6556b40 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -2966,7 +2966,6 @@ See also:
 * {{msg-mw|Tooltip-pt-preferences}}
 {{Identical|Preferences}}',
 'prefs-edits' => 'In user preferences.',
-'prefsnologin' => '{{Identical|Not logged in}}',
 'prefsnologintext2' => 'Parameters:
 * $1 - a link to [[Special:UserLogin]] with {{msg-mw|loginreqlink}} as link description',
 'changepassword' => "Section heading on [[Special:Preferences]], tab 'User profile'.
diff --git a/maintenance/dictionary/mediawiki.dic b/maintenance/dictionary/mediawiki.dic
index b6ca281c62..3665cbfb06 100644
--- a/maintenance/dictionary/mediawiki.dic
+++ b/maintenance/dictionary/mediawiki.dic
@@ -3126,7 +3126,6 @@ prefixindex
 prefixsearchdisabled
 prefs
 prefsection
-prefsnologin
 prefsnologintext2
 prefsubmit
 preload
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index c149ec6b74..55677939d7 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1028,7 +1028,6 @@ $wgMessageStructure = array(
 		'preferences-summary',
 		'mypreferences',
 		'prefs-edits',
-		'prefsnologin',
 		'prefsnologintext2',
 		'changepassword',
 		'changepassword-summary',
-- 
2.20.1