| Index: trunk/phase3/RELEASE-NOTES-1.18 |
| — | — | @@ -221,7 +221,8 @@ |
| 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's not empty |
| | 225 | + MediaWiki:loginend-https instead of MediaWiki:loginend, if it's not empty. |
| | 226 | + Same for signupend on the account creation page. |
| 226 | 227 | |
| 227 | 228 | === Bug fixes in 1.18 === |
| 228 | 229 | * mw.util.getScript has been implemented (like wfScript in GlobalFunctions.php) |
| Index: trunk/phase3/includes/specials/SpecialUserlogin.php |
| — | — | @@ -1041,12 +1041,20 @@ |
| 1042 | 1042 | } |
| 1043 | 1043 | |
| 1044 | 1044 | // Use loginend-https for HTTPS requests if it's not blank, loginend otherwise |
| 1045 | | - $httpsMsg = wfMessage( 'loginend-https' ); |
| 1046 | | - if ( WebRequest::detectProtocol() == 'https' && !$httpsMsg->isBlank() ) { |
| 1047 | | - $template->set( 'loginend', $httpsMsg->parse() ); |
| | 1045 | + // Ditto for signupend |
| | 1046 | + $usingHTTPS = WebRequest::detectProtocol(); |
| | 1047 | + $loginendHTTPS = wfMessage( 'loginend-https' ); |
| | 1048 | + $signupendHTTPS = wfMessage( 'signupend-https' ); |
| | 1049 | + if ( $usingHTTPS && !$loginendHTTPS->isBlank() ) { |
| | 1050 | + $template->set( 'loginend', $loginendHTTPS->parse() ); |
| 1048 | 1051 | } else { |
| 1049 | 1052 | $template->set( 'loginend', wfMessage( 'loginend' )->parse() ); |
| 1050 | 1053 | } |
| | 1054 | + if ( $usingHTTPS && !$signupendHTTPS->isBlank() ) { |
| | 1055 | + $template->set( 'signupend', $signupendHTTPS->parse() ); |
| | 1056 | + } else { |
| | 1057 | + $template->set( 'signupend', wfMessage( 'signupend' )->parse() ); |
| | 1058 | + } |
| 1051 | 1059 | |
| 1052 | 1060 | // Give authentication and captcha plugins a chance to modify the form |
| 1053 | 1061 | $wgAuth->modifyUITemplate( $template, $this->mType ); |
| Index: trunk/phase3/includes/templates/Userlogin.php |
| — | — | @@ -377,7 +377,7 @@ |
| 378 | 378 | <?php if( $this->haveData( 'token' ) ) { ?><input type="hidden" name="wpCreateaccountToken" value="<?php $this->text( 'token' ); ?>" /><?php } ?> |
| 379 | 379 | </form> |
| 380 | 380 | </div> |
| 381 | | -<div id="signupend"><?php $this->msgWiki( 'signupend' ); ?></div> |
| | 381 | +<div id="signupend"><?php $this->html( 'signupend' ); ?></div> |
| 382 | 382 | <?php |
| 383 | 383 | |
| 384 | 384 | } |