From: Tyler Anthony Romeo <tylerromeo@gmail.com>
Date: Sun, 7 Oct 2012 14:17:31 +0000 (-0400)
Subject: (bug 40789) Fixed $wgSecureLogin after-login redirect.
X-Git-Tag: 1.31.0-rc.0~22086^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=commitdiff_plain;h=4948768df75d2774962ff7b1ac08c84adf087f40;p=lhc%2Fweb%2Fwiklou.git

(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
---

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' ) {