Followup r98707, r98713: check for blankness, not nonexistence. Since r98713 the...

diff --git a/RELEASE-NOTES-1.18 b/RELEASE-NOTES-1.18
index 39b711e..e573272 100644 (file)
--- 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 c816979..6080c6c 100644 (file)
--- 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() );