From: Max Semenik <maxsem@users.mediawiki.org>
Date: Sat, 16 Apr 2011 07:39:41 +0000 (+0000)
Subject: Prevent bug 17790 from reappearing on Special:Preferences
X-Git-Tag: 1.31.0-rc.0~30801
X-Git-Url: http://git.cyclocoop.org/%22%20.%20%20%20%24self2%20.%20%20%20%22&var_mode_affiche=boucle?a=commitdiff_plain;h=12cb599cb7fee5c9814dbaa3d209b31292a9df9d;p=lhc%2Fweb%2Fwiklou.git

Prevent bug 17790 from reappearing on Special:Preferences
---

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 65577542e9..d40c073baf 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -626,7 +626,9 @@ class SkinTemplate extends Skin {
 			$personal_urls['logout'] = array(
 				'text' => wfMsg( 'userlogout' ),
 				'href' => self::makeSpecialUrl( 'Userlogout',
-					$title->isSpecial( 'Preferences' ) ? '' : $returnto
+					// userlogout link must always contain an & character, otherwise we might not be able
+					// to detect a buggy precaching proxy (bug 17790)
+					$title->isSpecial( 'Preferences' ) ? 'noreturnto' : $returnto
 				),
 				'active' => false
 			);