From 89e04c9abaeeda1df69ca18460e1c462411ac28d Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Sun, 2 Oct 2011 20:58:15 +0000 Subject: [PATCH] Followup r98707, r98713: check for blankness, not nonexistence. Since r98713 the -https message always exists, so the check was broken --- RELEASE-NOTES-1.18 | 2 +- includes/specials/SpecialUserlogin.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RELEASE-NOTES-1.18 b/RELEASE-NOTES-1.18 index 39b711eb93..e57327233d 100644 --- a/RELEASE-NOTES-1.18 +++ b/RELEASE-NOTES-1.18 @@ -221,7 +221,7 @@ production. * (bug 30497) Add client-nojs and client-js classes on document element to let styles easily hide or show things based on general JS availability * (bug 31293) If Special:Userlogin is loaded over HTTPS, display - MediaWiki:loginend-https instead of MediaWiki:loginend, if it exists + MediaWiki:loginend-https instead of MediaWiki:loginend, if it's not empty === Bug fixes in 1.18 === * mw.util.getScript has been implemented (like wfScript in GlobalFunctions.php) diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php index c816979103..6080c6c537 100644 --- a/includes/specials/SpecialUserlogin.php +++ b/includes/specials/SpecialUserlogin.php @@ -1040,9 +1040,9 @@ class LoginForm extends SpecialPage { $template->set( 'uselang', $this->mLanguage ); } - // Use loginend-https for HTTPS requests if it exists, loginend otherwise + // Use loginend-https for HTTPS requests if it's not blank, loginend otherwise $httpsMsg = wfMessage( 'loginend-https' ); - if ( WebRequest::detectProtocol() == 'https' && $httpsMsg->exists() ) { + if ( WebRequest::detectProtocol() == 'https' && !$httpsMsg->isBlank() ) { $template->set( 'loginend', $httpsMsg->parse() ); } else { $template->set( 'loginend', wfMessage( 'loginend' )->parse() ); -- 2.20.1