From: Platonides <platonides@gmail.com>
Date: Mon, 26 Nov 2012 21:32:23 +0000 (+0100)
Subject: Global tweaks wrt $wgSecureLogin.
X-Git-Tag: 1.31.0-rc.0~21499^2~2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/rappels.php?a=commitdiff_plain;h=f35fcb89e969a2fe0df074ade51822f70ac0e2aa;p=lhc%2Fweb%2Fwiklou.git

Global tweaks wrt $wgSecureLogin.

· Remove duplicated global.
· Do not define a global in a switch.

Change-Id: I9b30d602ae86e0f0643d7788188efb3af367dec8
---

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 173d37af6f..ddd0780dcd 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -643,7 +643,6 @@ class SkinTemplate extends Skin {
 			$is_signup = $request->getText( 'type' ) == 'signup';
 
 			# anonlogin & login are the same
-			global $wgSecureLogin;
 			$proto = $wgSecureLogin ? PROTO_HTTPS : null;
 
 			$login_id = $this->showIPinHeader() ? 'anonlogin' : 'login';
diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index dda159c26d..c9ac825476 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -752,11 +752,10 @@ class LoginForm extends SpecialPage {
 	}
 
 	function processLogin() {
-		global $wgMemc, $wgLang;
+		global $wgMemc, $wgLang, $wgSecureLogin;
 
 		switch ( $this->authenticateUserData() ) {
 			case self::SUCCESS:
-				global $wgSecureLogin;
 				# We've verified now, update the real record
 				$user = $this->getUser();
 				if( (bool)$this->mRemember != (bool)$user->getOption( 'rememberpassword' ) ) {