| Index: trunk/phase3/RELEASE-NOTES-1.18 |
| — | — | @@ -221,7 +221,7 @@ |
| 222 | 222 | * (bug 30497) Add client-nojs and client-js classes on document element |
| 223 | 223 | to let styles easily hide or show things based on general JS availability |
| 224 | 224 | * (bug 31293) If Special:Userlogin is loaded over HTTPS, display |
| 225 | | - MediaWiki:loginend-https instead of MediaWiki:loginend, if it exists |
| | 225 | + MediaWiki:loginend-https instead of MediaWiki:loginend, if it's not empty |
| 226 | 226 | |
| 227 | 227 | === Bug fixes in 1.18 === |
| 228 | 228 | * mw.util.getScript has been implemented (like wfScript in GlobalFunctions.php) |
| Index: trunk/phase3/includes/specials/SpecialUserlogin.php |
| — | — | @@ -1040,9 +1040,9 @@ |
| 1041 | 1041 | $template->set( 'uselang', $this->mLanguage ); |
| 1042 | 1042 | } |
| 1043 | 1043 | |
| 1044 | | - // Use loginend-https for HTTPS requests if it exists, loginend otherwise |
| | 1044 | + // Use loginend-https for HTTPS requests if it's not blank, loginend otherwise |
| 1045 | 1045 | $httpsMsg = wfMessage( 'loginend-https' ); |
| 1046 | | - if ( WebRequest::detectProtocol() == 'https' && $httpsMsg->exists() ) { |
| | 1046 | + if ( WebRequest::detectProtocol() == 'https' && !$httpsMsg->isBlank() ) { |
| 1047 | 1047 | $template->set( 'loginend', $httpsMsg->parse() ); |
| 1048 | 1048 | } else { |
| 1049 | 1049 | $template->set( 'loginend', wfMessage( 'loginend' )->parse() ); |