From: csteipp <csteipp@wikimedia.org>
Date: Sat, 31 Aug 2013 00:00:03 +0000 (-0700)
Subject: Also redirect if prefixed https cookie is preset
X-Git-Tag: 1.31.0-rc.0~18830^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/?a=commitdiff_plain;h=5e5843689a71e71e47145888360da590362839cf;p=lhc%2Fweb%2Fwiklou.git

Also redirect if prefixed https cookie is preset

After we switch to not using prefixes, still respect prefixed cookies
for users who are currently logged in.

Bug: 53538
Change-Id: I950e36e10420209fca28c41c438c363a3f332c14
---

diff --git a/includes/Wiki.php b/includes/Wiki.php
index 35fa8e66d5..c4c67abde5 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -509,6 +509,8 @@ class MediaWiki {
 		if (
 			(
 				$request->getCookie( 'forceHTTPS', '' ) ||
+				// check for prefixed version for currently logged in users
+				$request->getCookie( 'forceHTTPS' ) ||
 				// Avoid checking the user and groups unless it's enabled.
 				(
 					$this->context->getUser()->isLoggedIn()