| Index: trunk/phase3/RELEASE-NOTES-1.18 |
| — | — | @@ -220,6 +220,8 @@ |
| 221 | 221 | User:getDefaultOptions(). |
| 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 | +* (bug 31293) If Special:Userlogin is loaded over HTTPS, display |
| | 225 | + MediaWiki:loginend-https instead of MediaWiki:loginend, if it exists |
| 224 | 226 | |
| 225 | 227 | === Bug fixes in 1.18 === |
| 226 | 228 | * mw.util.getScript has been implemented (like wfScript in GlobalFunctions.php) |
| Index: trunk/phase3/includes/specials/SpecialUserlogin.php |
| — | — | @@ -1039,6 +1039,14 @@ |
| 1040 | 1040 | if( $this->mLanguage ) |
| 1041 | 1041 | $template->set( 'uselang', $this->mLanguage ); |
| 1042 | 1042 | } |
| | 1043 | + |
| | 1044 | + // Use loginend-https for HTTPS requests if it exists, loginend otherwise |
| | 1045 | + $httpsMsg = wfMessage( 'loginend-https' ); |
| | 1046 | + if ( WebRequest::detectProtocol() == 'https' && $httpsMsg->exists() ) { |
| | 1047 | + $template->set( 'loginend', $httpsMsg->parse() ); |
| | 1048 | + } else { |
| | 1049 | + $template->set( 'loginend', wfMessage( 'loginend' )->parse() ); |
| | 1050 | + } |
| 1043 | 1051 | |
| 1044 | 1052 | // Give authentication and captcha plugins a chance to modify the form |
| 1045 | 1053 | $wgAuth->modifyUITemplate( $template, $this->mType ); |
| Index: trunk/phase3/includes/templates/Userlogin.php |
| — | — | @@ -152,7 +152,7 @@ |
| 153 | 153 | <?php if( $this->haveData( 'token' ) ) { ?><input type="hidden" name="wpLoginToken" value="<?php $this->text( 'token' ); ?>" /><?php } ?> |
| 154 | 154 | </form> |
| 155 | 155 | </div> |
| 156 | | -<div id="loginend"><?php $this->msgWiki( 'loginend' ); ?></div> |
| | 156 | +<div id="loginend"><?php $this->html( 'loginend' ); ?></div> |
| 157 | 157 | <?php |
| 158 | 158 | |
| 159 | 159 | } |