From 863dba8a8d064f4e9c3cce9ae32ab9f65a4d5806 Mon Sep 17 00:00:00 2001
From: X! <soxred93@users.mediawiki.org>
Date: Sat, 13 Sep 2008 06:27:17 +0000
Subject: [PATCH] (bug 12284) Special:Preferences now sets a returnto parameter
 on the link to Special:Userlogin. Patch by Marooned.

---
 CREDITS                                  | 1 +
 RELEASE-NOTES                            | 1 +
 includes/specials/SpecialPreferences.php | 4 ++--
 languages/messages/MessagesEn.php        | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CREDITS b/CREDITS
index c38145ee32..e37ea1be89 100644
--- a/CREDITS
+++ b/CREDITS
@@ -45,6 +45,7 @@ following names for their contribution to the product.
 * Jeremy Baron
 * Juliano F. Ravasi
 * Louperivois
+* Marooned
 * Matt Johnston
 * Max Semenik
 * Michael De La Rue
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5d202fa73b..c68068aa1e 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -196,6 +196,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 15497) Removed encoding attribute from <?xml ?> tag
 * (bug 15544) Wiki not set up message (NoLocalSettings.php) now works for 
   non-index.php entry pages (e.g. api.php). Patch by Matt Johnston.
+* (bug 12284) Special:Preferences now sets a returnto parameter on the link to Special:Userlogin. Patch by Marooned.
 
 
 === API changes in 1.14 ===
diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index b5727497c9..bc33f091fc 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -104,10 +104,10 @@ class PreferencesForm {
 	}
 
 	function execute() {
-		global $wgUser, $wgOut;
+		global $wgUser, $wgOut, $wgTitle;
 
 		if ( $wgUser->isAnon() ) {
-			$wgOut->showErrorPage( 'prefsnologin', 'prefsnologintext' );
+			$wgOut->showErrorPage( 'prefsnologin', 'prefsnologintext', array($wgTitle->getPrefixedDBkey()) );
 			return;
 		}
 		if ( wfReadOnly() ) {
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 859e6c6fa1..edc5a9bb34 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1467,7 +1467,7 @@ Note that their indexes of {{SITENAME}} content may be out of date.',
 'mypreferences'            => 'My preferences',
 'prefs-edits'              => 'Number of edits:',
 'prefsnologin'             => 'Not logged in',
-'prefsnologintext'         => 'You must be [[Special:UserLogin|logged in]] to set user preferences.',
+'prefsnologintext'         => 'You must be <span class="plainlinks">[{{fullurl:Special:Userlogin|returnto=$1}} logged in]</span> to set user preferences.',
 'prefsreset'               => 'Preferences have been reset from storage.',
 'qbsettings'               => 'Quickbar',
 'qbsettings-none'          => 'None',
-- 
2.20.1