| Index: branches/wmf/1.18wmf1/RELEASE-NOTES-1.18 |
| — | — | @@ -211,6 +211,8 @@ |
| 212 | 212 | $wgDefaultUserOptions should no longer be used as it will contain those set via |
| 213 | 213 | User:getDefaultOptions(). |
| 214 | 214 | * (bug 30722) Add a new collation that sorts categories in ascii sort order. |
| | 215 | +* (bug 31293) If Special:Userlogin is loaded over HTTPS, display |
| | 216 | + MediaWiki:loginend-https instead of MediaWiki:loginend, if it exists |
| 215 | 217 | |
| 216 | 218 | === Bug fixes in 1.18 === |
| 217 | 219 | * 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 |
| 218 | 220 | Merged /trunk/phase3/RELEASE-NOTES-1.18:r98707 |
| Index: branches/wmf/1.18wmf1/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 | } |
| Index: branches/wmf/1.18wmf1/includes/specials/SpecialUserlogin.php |
| — | — | @@ -1034,6 +1034,14 @@ |
| 1035 | 1035 | if( $this->mLanguage ) |
| 1036 | 1036 | $template->set( 'uselang', $this->mLanguage ); |
| 1037 | 1037 | } |
| | 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() ); |
| | 1043 | + } else { |
| | 1044 | + $template->set( 'loginend', wfMessage( 'loginend' )->parse() ); |
| | 1045 | + } |
| 1038 | 1046 | |
| 1039 | 1047 | // Give authentication and captcha plugins a chance to modify the form |
| 1040 | 1048 | $wgAuth->modifyUITemplate( $template, $this->mType ); |