From 5e5843689a71e71e47145888360da590362839cf Mon Sep 17 00:00:00 2001 From: csteipp Date: Fri, 30 Aug 2013 17:00:03 -0700 Subject: [PATCH] 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 --- includes/Wiki.php | 2 ++ 1 file changed, 2 insertions(+) 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() -- 2.20.1