From 4948768df75d2774962ff7b1ac08c84adf087f40 Mon Sep 17 00:00:00 2001 From: Tyler Anthony Romeo Date: Sun, 7 Oct 2012 10:17:31 -0400 Subject: [PATCH] (bug 40789) Fixed $wgSecureLogin after-login redirect. Check for $wgSecureLogin accidentally redirected users to HTTPS when $wgSecureLogin was off. This fixes the conditional statement so that when secure login is off original functionality is preserved. Change-Id: Ida8a2de849e2ad208129b272936ebc5806a16d71 --- includes/specials/SpecialUserlogin.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php index b7d01c8114..ca14096c9c 100644 --- a/includes/specials/SpecialUserlogin.php +++ b/includes/specials/SpecialUserlogin.php @@ -988,9 +988,12 @@ class LoginForm extends SpecialPage { if ( $wgSecureLogin && !$this->mStickHTTPS ) { $options = array( 'http' ); $proto = PROTO_HTTP; - } else { + } elseif( $wgSecureLogin ) { $options = array( 'https' ); $proto = PROTO_HTTPS; + } else { + $options = array(); + $proto = PROTO_RELATIVE; } if ( $type == 'successredirect' ) { -- 2.20.1