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 35fa8e6..c4c67ab 100644 (file)
--- 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()