| Index: trunk/phase3/includes/SpecialContributions.php |
| — | — | @@ -364,7 +364,7 @@ |
| 365 | 365 | static $messages; |
| 366 | 366 | if( !isset( $messages ) ) { |
| 367 | 367 | foreach( explode( ' ', 'uctop diff newarticle rollbacklink diff hist minoreditletter' ) as $msg ) { |
| 368 | | - $messages[$msg] = wfMsg( $msg ); |
| | 368 | + $messages[$msg] = wfMsgExt( $msg, array( 'escape') ); |
| 369 | 369 | } |
| 370 | 370 | } |
| 371 | 371 | |
| Index: trunk/phase3/includes/SpecialWatchlist.php |
| — | — | @@ -43,7 +43,7 @@ |
| 44 | 44 | /* float */ 'days' => floatval( $wgUser->getOption( 'watchlistdays' ) ), /* 3.0 or 0.5, watch further below */ |
| 45 | 45 | /* bool */ 'hideOwn' => (int)$wgUser->getBoolOption( 'watchlisthideown' ), |
| 46 | 46 | /* bool */ 'hideBots' => (int)$wgUser->getBoolOption( 'watchlisthidebots' ), |
| 47 | | - 'namespace' => 'all', |
| | 47 | + /* ? */ 'namespace' => 'all', |
| 48 | 48 | ); |
| 49 | 49 | |
| 50 | 50 | extract($defaults); |
| — | — | @@ -343,12 +343,12 @@ |
| 344 | 344 | # Form for namespace filtering |
| 345 | 345 | $thisAction = $thisTitle->escapeLocalUrl(); |
| 346 | 346 | $nsForm = "<form method=\"post\" action=\"{$thisAction}\">\n"; |
| 347 | | - $nsForm .= "<label for=\"namespace\">" . wfMsg( 'namespace' ) . "</label> "; |
| | 347 | + $nsForm .= "<label for=\"namespace\">" . wfMsgExt( 'namespace', array( 'parseinline') ) . "</label> "; |
| 348 | 348 | $nsForm .= HTMLnamespaceselector( $nameSpace, '' ) . "\n"; |
| 349 | 349 | $nsForm .= ( $hideOwn ? "<input type=\"hidden\" name=\"hideown\" value=\"1\" />\n" : "" ); |
| 350 | 350 | $nsForm .= ( $hideBots ? "<input type=\"hidden\" name=\"hidebots\" value=\"1\" />\n" : "" ); |
| 351 | 351 | $nsForm .= "<input type=\"hidden\" name=\"days\" value=\"" . $days . "\" />\n"; |
| 352 | | - $nsForm .= "<input type=\"submit\" name=\"submit\" value=\"" . wfMsgHtml( 'allpagessubmit' ) . "\" />\n"; |
| | 352 | + $nsForm .= "<input type=\"submit\" name=\"submit\" value=\"" . wfMsgExt( 'allpagessubmit', array( 'escape') ) . "\" />\n"; |
| 353 | 353 | $nsForm .= "</form>\n"; |
| 354 | 354 | $wgOut->addHTML( $nsForm ); |
| 355 | 355 | |
| — | — | @@ -419,6 +419,9 @@ |
| 420 | 420 | return $s; |
| 421 | 421 | } |
| 422 | 422 | |
| | 423 | +/** |
| | 424 | + * Returns html |
| | 425 | + */ |
| 423 | 426 | function wlCutoffLinks( $days, $page = 'Watchlist', $options = array() ) { |
| 424 | 427 | $hours = array( 1, 2, 6, 12 ); |
| 425 | 428 | $days = array( 1, 3, 7 ); |
| — | — | @@ -431,7 +434,8 @@ |
| 432 | 435 | foreach( $days as $d ) { |
| 433 | 436 | $days[$i++] = wlDaysLink( $d, $page, $options ); |
| 434 | 437 | } |
| 435 | | - return wfMsg ('wlshowlast', |
| | 438 | + return wfMsgExt('wlshowlast', |
| | 439 | + array('parseinline', 'replaceafter'), |
| 436 | 440 | implode(' | ', $hours), |
| 437 | 441 | implode(' | ', $days), |
| 438 | 442 | wlDaysLink( 0, $page, $options ) ); |