From f35fcb89e969a2fe0df074ade51822f70ac0e2aa Mon Sep 17 00:00:00 2001 From: Platonides Date: Mon, 26 Nov 2012 22:32:23 +0100 Subject: [PATCH] Global tweaks wrt $wgSecureLogin. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit · Remove duplicated global. · Do not define a global in a switch. Change-Id: I9b30d602ae86e0f0643d7788188efb3af367dec8 --- includes/SkinTemplate.php | 1 - includes/specials/SpecialUserlogin.php | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) 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' ) ) { -- 2.20.1