| Index: branches/wmf/1.17wmf1/includes/specials/SpecialUserlogin.php |
| — | — | @@ -1072,6 +1072,14 @@ |
| 1073 | 1073 | if( $this->mLanguage ) |
| 1074 | 1074 | $template->set( 'uselang', $this->mLanguage ); |
| 1075 | 1075 | } |
| | 1076 | + |
| | 1077 | + // Use loginend-https for HTTPS requests if it exists, loginend otherwise |
| | 1078 | + $httpsMsg = wfMessage( 'loginend-https' ); |
| | 1079 | + if ( WebRequest::detectProtocol() == 'https' && $httpsMsg->exists() ) { |
| | 1080 | + $template->set( 'loginend', $httpsMsg->parse() ); |
| | 1081 | + } else { |
| | 1082 | + $template->set( 'loginend', wfMessage( 'loginend' )->parse() ); |
| | 1083 | + } |
| 1076 | 1084 | |
| 1077 | 1085 | // Give authentication and captcha plugins a chance to modify the form |
| 1078 | 1086 | $wgAuth->modifyUITemplate( $template, $this->mType ); |
| Index: branches/wmf/1.17wmf1/includes/templates/Userlogin.php |
| — | — | @@ -144,7 +144,7 @@ |
| 145 | 145 | <?php if( @$this->haveData( 'token' ) ) { ?><input type="hidden" name="wpLoginToken" value="<?php $this->text( 'token' ); ?>" /><?php } ?> |
| 146 | 146 | </form> |
| 147 | 147 | </div> |
| 148 | | -<div id="loginend"><?php $this->msgWiki( 'loginend' ); ?></div> |
| | 148 | +<div id="loginend"><?php $this->html( 'loginend' ); ?></div> |
| 149 | 149 | <?php |
| 150 | 150 | |
| 151 | 151 | } |