| Index: trunk/phase3/includes/ProtectionForm.php |
| — | — | @@ -320,7 +320,7 @@ |
| 321 | 321 | function buildExpiryInput() { |
| 322 | 322 | $attribs = array( 'id' => 'expires' ) + $this->disabledAttrib; |
| 323 | 323 | return '<tr>' |
| 324 | | - . '<td><label for="expires">' . wfMsgWithLinks( 'protectexpiry' ) . '</label></td>' |
| | 324 | + . '<td><label for="expires">' . wfMsgExt( 'protectexpiry', array( 'parseinline' ) ) . '</label></td>' |
| 325 | 325 | . '<td>' . Xml::input( 'mwProtect-expiry', 60, $this->mExpiry, $attribs ) . '</td>' |
| 326 | 326 | . '</tr>'; |
| 327 | 327 | } |
| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -327,20 +327,6 @@ |
| 328 | 328 | } |
| 329 | 329 | |
| 330 | 330 | /** |
| 331 | | - * Get a message in the user interface language and replace wiki |
| 332 | | - * links with clickable ones, escaping other HTML |
| 333 | | - * |
| 334 | | - * @param string $key Message key |
| 335 | | - * @return string |
| 336 | | - */ |
| 337 | | -function wfMsgWithLinks( $key ) { |
| 338 | | - global $wgUser; |
| 339 | | - $args = func_get_args(); |
| 340 | | - return $wgUser->getSkin()->formatLinksInComment( htmlspecialchars( |
| 341 | | - call_user_func_array( 'wfMsg', $args ) ) ); |
| 342 | | -} |
| 343 | | - |
| 344 | | -/** |
| 345 | 331 | * Same as above except doesn't transform the message |
| 346 | 332 | */ |
| 347 | 333 | function wfMsgNoTrans( $key ) { |
| — | — | @@ -383,19 +369,6 @@ |
| 384 | 370 | } |
| 385 | 371 | |
| 386 | 372 | /** |
| 387 | | - * Get a message in the content language and replace wiki |
| 388 | | - * links with clickable ones, escaping other HTML |
| 389 | | - * |
| 390 | | - * @param string $key Message key |
| 391 | | - * @return string |
| 392 | | - */ |
| 393 | | -function wfMsgForContentWithLinks( $key ) { |
| 394 | | - global $wgUser; |
| 395 | | - return $wgUser->getSkin()->formatLinksInComment( htmlspecialchars( |
| 396 | | - call_user_func_array( 'wfMsgForContent', func_get_args() ) ) ); |
| 397 | | -} |
| 398 | | - |
| 399 | | -/** |
| 400 | 373 | * Same as above except doesn't transform the message |
| 401 | 374 | */ |
| 402 | 375 | function wfMsgForContentNoTrans( $key ) { |
| Index: trunk/phase3/includes/SpecialWithoutinterwiki.php |
| — | — | @@ -14,7 +14,7 @@ |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | function getPageHeader() { |
| 18 | | - return '<p>' . wfMsgWithLinks( 'withoutinterwiki-header' ) . '</p>'; |
| | 18 | + return '<p>' . wfMsgExt( 'withoutinterwiki-header', array( 'parseinline' ) ) . '</p>'; |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | function sortDescending() { |