| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -1312,9 +1312,9 @@ |
| 1313 | 1313 | * @param $text String |
| 1314 | 1314 | * @param $linestart Boolean: is this the start of a line? |
| 1315 | 1315 | */ |
| 1316 | | - public function addWikiText( $text, $linestart = true ) { |
| | 1316 | + public function addWikiText( $text, $linestart = true, $interface = false ) { |
| 1317 | 1317 | $title = $this->getTitle(); // Work arround E_STRICT |
| 1318 | | - $this->addWikiTextTitle( $text, $title, $linestart ); |
| | 1318 | + $this->addWikiTextTitle( $text, $title, $linestart, /*tidy*/false, $interface ); |
| 1319 | 1319 | } |
| 1320 | 1320 | |
| 1321 | 1321 | /** |
| — | — | @@ -1357,8 +1357,10 @@ |
| 1358 | 1358 | * @param $title Title object |
| 1359 | 1359 | * @param $linestart Boolean: is this the start of a line? |
| 1360 | 1360 | * @param $tidy Boolean: whether to use tidy |
| | 1361 | + * @param $interface Boolean: whether it is an interface message |
| | 1362 | + * (for example disables conversion) |
| 1361 | 1363 | */ |
| 1362 | | - public function addWikiTextTitle( $text, &$title, $linestart, $tidy = false ) { |
| | 1364 | + public function addWikiTextTitle( $text, &$title, $linestart, $tidy = false, $interface = false ) { |
| 1363 | 1365 | global $wgParser; |
| 1364 | 1366 | |
| 1365 | 1367 | wfProfileIn( __METHOD__ ); |
| — | — | @@ -1367,6 +1369,7 @@ |
| 1368 | 1370 | |
| 1369 | 1371 | $popts = $this->parserOptions(); |
| 1370 | 1372 | $oldTidy = $popts->setTidy( $tidy ); |
| | 1373 | + $popts->setInterfaceMessage( (bool) $interface ); |
| 1371 | 1374 | |
| 1372 | 1375 | $parserOutput = $wgParser->parse( |
| 1373 | 1376 | $text, $title, $popts, |
| — | — | @@ -1938,7 +1941,8 @@ |
| 1939 | 1942 | $this->enableClientCache( false ); |
| 1940 | 1943 | $this->mRedirect = ''; |
| 1941 | 1944 | $this->mBodytext = ''; |
| 1942 | | - $this->addWikiText( $this->formatPermissionsErrorMessage( $errors, $action ) ); |
| | 1945 | + $this->addWikiText( $this->formatPermissionsErrorMessage( $errors, $action ), |
| | 1946 | + /*linestart*/true, /*interface*/true ); |
| 1943 | 1947 | } |
| 1944 | 1948 | |
| 1945 | 1949 | /** |
| — | — | @@ -2077,7 +2081,8 @@ |
| 2078 | 2082 | } else { |
| 2079 | 2083 | $this->setPageTitle( wfMsg( 'badaccess' ) ); |
| 2080 | 2084 | } |
| 2081 | | - $this->addWikiText( $this->formatPermissionsErrorMessage( $reasons, $action ) ); |
| | 2085 | + $this->addWikiText( $this->formatPermissionsErrorMessage( $reasons, $action ), |
| | 2086 | + /*linestart*/true, /*interface*/true ); |
| 2082 | 2087 | } else { |
| 2083 | 2088 | // Wiki is read only |
| 2084 | 2089 | throw new ReadOnlyError; |
| — | — | @@ -3215,7 +3220,7 @@ |
| 3216 | 3221 | } |
| 3217 | 3222 | $s = str_replace( '$' . ( $n + 1 ), wfMsgExt( $name, $options, $args ), $s ); |
| 3218 | 3223 | } |
| 3219 | | - $this->addWikiText( $s ); |
| | 3224 | + $this->addWikiText( $s, /*linestart*/true, /*interface*/true ); |
| 3220 | 3225 | } |
| 3221 | 3226 | |
| 3222 | 3227 | /** |
| Index: trunk/phase3/includes/specials/SpecialVersion.php |
| — | — | @@ -64,7 +64,7 @@ |
| 65 | 65 | $text .= $this->getWgHooks(); |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | | - $out->addWikiText( $text ); |
| | 68 | + $out->addWikiText( $text, /*linestart*/true, /*interface*/true ); |
| 69 | 69 | $out->addHTML( $this->IPInfo() ); |
| 70 | 70 | |
| 71 | 71 | if ( $this->getRequest()->getVal( 'easteregg' ) ) { |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1842,7 +1842,7 @@ |
| 1843 | 1843 | 'yourrealname' => 'Real name:', |
| 1844 | 1844 | 'yourlanguage' => 'Language:', |
| 1845 | 1845 | 'yourvariant' => 'Content language variant:', |
| 1846 | | -'prefs-help-variant' => 'Your preferred variant or orthography to display the content pages of this wiki in.', |
| | 1846 | +'prefs-help-variant' => 'Your preferred variant or orthography to display the content pages of this wiki in.', |
| 1847 | 1847 | 'yournick' => 'New signature:', |
| 1848 | 1848 | 'prefs-help-signature' => 'Comments on talk pages should be signed with "<nowiki>~~~~</nowiki>" which will be converted into your signature and a timestamp.', |
| 1849 | 1849 | 'badsig' => 'Invalid raw signature. |