| Index: branches/REL1_4/phase3/includes/SkinTemplate.php |
| — | — | @@ -964,8 +964,21 @@ |
| 965 | 965 | } |
| 966 | 966 | |
| 967 | 967 | /** |
| | 968 | + * An ugly, ugly hack. |
| 968 | 969 | * @access private |
| 969 | 970 | */ |
| | 971 | + function msgWiki( $str ) { |
| | 972 | + global $wgParser, $wgTitle, $wgOut, $wgUseTidy; |
| | 973 | + |
| | 974 | + $text = $this->translator->translate( $str ); |
| | 975 | + $parserOutput = $wgParser->parse( $text, $wgTitle, |
| | 976 | + $wgOut->mParserOptions, true ); |
| | 977 | + echo $parserOutput->getText(); |
| | 978 | + } |
| | 979 | + |
| | 980 | + /** |
| | 981 | + * @access private |
| | 982 | + */ |
| 970 | 983 | function haveData( $str ) { |
| 971 | 984 | return $this->data[$str]; |
| 972 | 985 | } |
| Index: branches/REL1_4/phase3/includes/templates/Userlogin.php |
| — | — | @@ -17,7 +17,7 @@ |
| 18 | 18 | <p class='error'><?php $this->html('error') ?></p> |
| 19 | 19 | <?php } else { ?> |
| 20 | 20 | <h2><?php $this->msg('login' ) ?>:</h2> |
| 21 | | - <p><?php $this->msg('loginprompt') ?></p> |
| | 21 | + <p><?php $this->msgWiki('loginprompt') ?></p> |
| 22 | 22 | <?php } ?> |
| 23 | 23 | <form name="userlogin" id="userlogin" method="post" action="<?php $this->text('action') ?>"> |
| 24 | 24 | <table border='0'> |
| — | — | @@ -102,7 +102,7 @@ |
| 103 | 103 | </table> |
| 104 | 104 | </form> |
| 105 | 105 | <?php |
| 106 | | - $this->msgHtml( 'loginend' ); |
| | 106 | + $this->msgWiki( 'loginend' ); |
| 107 | 107 | } |
| 108 | 108 | } |
| 109 | 109 | |
| Index: branches/REL1_4/phase3/RELEASE-NOTES |
| — | — | @@ -157,8 +157,8 @@ |
| 158 | 158 | * Undo overly bright, difficult to read colors in Cologne Blue |
| 159 | 159 | * (bug 1162) fix five-tilde date inserter |
| 160 | 160 | * Add raw signatures option for those who simply must have cute sigs |
| | 161 | +* (bug 1164) Let wikitext be used in Loginprompt and Loginend messages |
| 161 | 162 | |
| 162 | | - |
| 163 | 163 | === Caveats === |
| 164 | 164 | |
| 165 | 165 | Some output, particularly involving user-supplied inline HTML, may not |