| Index: branches/wmf/1.18wmf1/maintenance/language/messages.inc |
| — | — | @@ -469,8 +469,10 @@ |
| 470 | 470 | 'throttled-mailpassword', |
| 471 | 471 | 'loginstart', |
| 472 | 472 | 'loginend', |
| | 473 | + 'loginend-https', |
| 473 | 474 | 'signupstart', |
| 474 | 475 | 'signupend', |
| | 476 | + 'signupend-https', |
| 475 | 477 | 'mailerror', |
| 476 | 478 | 'acct_creation_throttle_hit', |
| 477 | 479 | 'emailauthenticated', |
| Index: branches/wmf/1.18wmf1/maintenance/language/messageTypes.inc |
| — | — | @@ -105,6 +105,7 @@ |
| 106 | 106 | 'history_copyright', |
| 107 | 107 | 'licenses', |
| 108 | 108 | 'loginstart', |
| | 109 | + 'loginend-https', |
| 109 | 110 | 'loginend', |
| 110 | 111 | 'loginlanguagelinks', |
| 111 | 112 | 'pear-mail-error', |
| — | — | @@ -128,6 +129,7 @@ |
| 129 | 130 | 'signature-anon', |
| 130 | 131 | 'signupstart', |
| 131 | 132 | 'signupend', |
| | 133 | + 'signupend-https', |
| 132 | 134 | 'sitenotice', |
| 133 | 135 | 'sitesubtitle', |
| 134 | 136 | 'sitetitle', |
| Index: branches/wmf/1.18wmf1/RELEASE-NOTES-1.18 |
| — | — | @@ -212,7 +212,8 @@ |
| 213 | 213 | User:getDefaultOptions(). |
| 214 | 214 | * (bug 30722) Add a new collation that sorts categories in ascii sort order. |
| 215 | 215 | * (bug 31293) If Special:Userlogin is loaded over HTTPS, display |
| 216 | | - MediaWiki:loginend-https instead of MediaWiki:loginend, if it exists |
| | 216 | + MediaWiki:loginend-https instead of MediaWiki:loginend, if it's not empty. |
| | 217 | + Same for signupend on the account creation page. |
| 217 | 218 | |
| 218 | 219 | === Bug fixes in 1.18 === |
| 219 | 220 | * mw.util.getScript has been implemented (like wfScript in GlobalFunctions.php) |
| Property changes on: branches/wmf/1.18wmf1/RELEASE-NOTES-1.18 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 220 | 221 | Merged /trunk/phase3/RELEASE-NOTES-1.18:r98713,98716,98718-98720 |
| Index: branches/wmf/1.18wmf1/includes/specials/SpecialUserlogin.php |
| — | — | @@ -1035,13 +1035,21 @@ |
| 1036 | 1036 | $template->set( 'uselang', $this->mLanguage ); |
| 1037 | 1037 | } |
| 1038 | 1038 | |
| 1039 | | - // Use loginend-https for HTTPS requests if it exists, loginend otherwise |
| 1040 | | - $httpsMsg = wfMessage( 'loginend-https' ); |
| 1041 | | - if ( WebRequest::detectProtocol() == 'https' && $httpsMsg->exists() ) { |
| 1042 | | - $template->set( 'loginend', $httpsMsg->parse() ); |
| | 1039 | + // Use loginend-https for HTTPS requests if it's not blank, loginend otherwise |
| | 1040 | + // Ditto for signupend |
| | 1041 | + $usingHTTPS = WebRequest::detectProtocol(); |
| | 1042 | + $loginendHTTPS = wfMessage( 'loginend-https' ); |
| | 1043 | + $signupendHTTPS = wfMessage( 'signupend-https' ); |
| | 1044 | + if ( $usingHTTPS && !$loginendHTTPS->isBlank() ) { |
| | 1045 | + $template->set( 'loginend', $loginendHTTPS->parse() ); |
| 1043 | 1046 | } else { |
| 1044 | 1047 | $template->set( 'loginend', wfMessage( 'loginend' )->parse() ); |
| 1045 | 1048 | } |
| | 1049 | + if ( $usingHTTPS && !$signupendHTTPS->isBlank() ) { |
| | 1050 | + $template->set( 'signupend', $signupendHTTPS->parse() ); |
| | 1051 | + } else { |
| | 1052 | + $template->set( 'signupend', wfMessage( 'signupend' )->parse() ); |
| | 1053 | + } |
| 1046 | 1054 | |
| 1047 | 1055 | // Give authentication and captcha plugins a chance to modify the form |
| 1048 | 1056 | $wgAuth->modifyUITemplate( $template, $this->mType ); |
| Index: branches/wmf/1.18wmf1/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 | } |
| Index: branches/wmf/1.18wmf1/languages/messages/MessagesEn.php |
| — | — | @@ -1111,8 +1111,10 @@ |
| 1112 | 1112 | To prevent abuse, only one password reminder will be sent per {{PLURAL:$1|hour|$1 hours}}.', |
| 1113 | 1113 | 'loginstart' => '', # do not translate or duplicate this message to other languages |
| 1114 | 1114 | 'loginend' => '', # do not translate or duplicate this message to other languages |
| | 1115 | +'loginend-https' => '', # do not translate or duplicate this message to other languages |
| 1115 | 1116 | 'signupstart' => '{{int:loginstart}}', # do not translate or duplicate this message to other languages |
| 1116 | 1117 | 'signupend' => '{{int:loginend}}', # do not translate or duplicate this message to other languages |
| | 1118 | +'signupend-https' => '', # do not translate or duplicate this message to other languages |
| 1117 | 1119 | 'mailerror' => 'Error sending mail: $1', |
| 1118 | 1120 | 'acct_creation_throttle_hit' => 'Visitors to this wiki using your IP address have created {{PLURAL:$1|1 account|$1 accounts}} in the last day, which is the maximum allowed in this time period. |
| 1119 | 1121 | As a result, visitors using this IP address cannot create any more accounts at the moment.', |