| Index: trunk/phase3/includes/specials/SpecialContributions.php |
| — | — | @@ -226,11 +226,21 @@ |
| 227 | 227 | $links = $wgLang->pipeList( $tools ); |
| 228 | 228 | |
| 229 | 229 | // Show a note if the user is blocked and display the last block log entry. |
| 230 | | - if ( User::newFromID( $id )->isBlocked() ) |
| 231 | | - LogEventsList::showLogExtract( $wgOut, 'block', $nt->getPrefixedText(), '', |
| 232 | | - array( 'lim' => 1, 'showIfEmpty' => false, 'msgKey' => array( 'sp-contributions-blocked-notice' ) ) ); |
| | 230 | + if ( User::newFromID( $id )->isBlocked() ) { |
| | 231 | + LogEventsList::showLogExtract( |
| | 232 | + $wgOut, |
| | 233 | + 'block', |
| | 234 | + $nt->getPrefixedText(), |
| | 235 | + '', |
| | 236 | + array( |
| | 237 | + 'lim' => 1, |
| | 238 | + 'showIfEmpty' => false, |
| | 239 | + 'msgKey' => array( 'sp-contributions-blocked-notice' ) |
| | 240 | + ) |
| | 241 | + ); |
| | 242 | + } |
| 233 | 243 | } |
| 234 | | - |
| | 244 | + |
| 235 | 245 | // Old message 'contribsub' had one parameter, but that doesn't work for |
| 236 | 246 | // languages that want to put the "for" bit right after $user but before |
| 237 | 247 | // $links. If 'contribsub' is around, use it for reverse compatibility, |
| — | — | @@ -418,9 +428,13 @@ |
| 419 | 429 | |
| 420 | 430 | function __construct( $target, $namespace = false, $year = false, $month = false, $tagFilter = false ) { |
| 421 | 431 | parent::__construct(); |
| 422 | | - foreach( explode( ' ', 'uctop diff newarticle rollbacklink diff hist rev-delundel pipe-separator' ) as $msg ) { |
| 423 | | - $this->messages[$msg] = wfMsgExt( $msg, array( 'escape') ); |
| | 432 | + |
| | 433 | + $msgs = array( 'uctop', 'diff', 'newarticle', 'rollbacklink', 'diff', 'hist', 'rev-delundel', 'pipe-separator' ); |
| | 434 | + |
| | 435 | + foreach( $msgs as $msg ) { |
| | 436 | + $this->messages[$msg] = wfMsgExt( $msg, 'escapenoentities' ); |
| 424 | 437 | } |
| | 438 | + |
| 425 | 439 | $this->target = $target; |
| 426 | 440 | $this->namespace = $namespace; |
| 427 | 441 | $this->tagFilter = $tagFilter; |
| — | — | @@ -461,14 +475,16 @@ |
| 462 | 476 | 'options' => array( 'USE INDEX' => array('revision' => $index) ), |
| 463 | 477 | 'join_conds' => $join_cond |
| 464 | 478 | ); |
| 465 | | - |
| 466 | | - ChangeTags::modifyDisplayQuery( $queryInfo['tables'], |
| 467 | | - $queryInfo['fields'], |
| 468 | | - $queryInfo['conds'], |
| 469 | | - $queryInfo['join_conds'], |
| 470 | | - $queryInfo['options'], |
| 471 | | - $this->tagFilter ); |
| 472 | | - |
| | 479 | + |
| | 480 | + ChangeTags::modifyDisplayQuery( |
| | 481 | + $queryInfo['tables'], |
| | 482 | + $queryInfo['fields'], |
| | 483 | + $queryInfo['conds'], |
| | 484 | + $queryInfo['join_conds'], |
| | 485 | + $queryInfo['options'], |
| | 486 | + $this->tagFilter |
| | 487 | + ); |
| | 488 | + |
| 473 | 489 | wfRunHooks( 'ContribsPager::getQueryInfo', array( &$this, &$queryInfo ) ); |
| 474 | 490 | return $queryInfo; |
| 475 | 491 | } |
| — | — | @@ -543,12 +559,13 @@ |
| 544 | 560 | if( $row->rev_id == $row->page_latest ) { |
| 545 | 561 | $topmarktext .= '<span class="mw-uctop">' . $this->messages['uctop'] . '</span>'; |
| 546 | 562 | if( !$row->page_is_new ) { |
| 547 | | - $difftext .= '(' . $sk->linkKnown( |
| | 563 | + $difflink = $sk->linkKnown( |
| 548 | 564 | $page, |
| 549 | 565 | $this->messages['diff'], |
| 550 | 566 | array(), |
| 551 | 567 | array( 'diff' => 0 ) |
| 552 | | - ) . ')'; |
| | 568 | + ); |
| | 569 | + $difftext .= wfMsg( 'parentheses', $difflink ); |
| 553 | 570 | # Add rollback link |
| 554 | 571 | if( $page->quickUserCan( 'rollback') && $page->quickUserCan( 'edit' ) ) { |
| 555 | 572 | $topmarktext .= ' '.$sk->generateRollback( $rev ); |
| — | — | @@ -593,7 +610,7 @@ |
| 594 | 611 | |
| 595 | 612 | if( $this->target == 'newbies' ) { |
| 596 | 613 | $userlink = ' . . ' . $sk->userLink( $row->rev_user, $row->rev_user_text ); |
| 597 | | - $userlink .= ' (' . $sk->userTalkLink( $row->rev_user, $row->rev_user_text ) . ') '; |
| | 614 | + $userlink .= ' ' . wfMsgExt( 'parentheses', 'escapenoentities', $sk->userTalkLink( $row->rev_user, $row->rev_user_text ) ) . ' '; |
| 598 | 615 | } else { |
| 599 | 616 | $userlink = ''; |
| 600 | 617 | } |
| — | — | @@ -614,7 +631,7 @@ |
| 615 | 632 | // If revision was hidden from sysops |
| 616 | 633 | if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) { |
| 617 | 634 | $del = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), |
| 618 | | - '(' . $this->messages['rev-delundel'] . ')' ) . ' '; |
| | 635 | + wfMsg( 'parentheses', $this->messages['rev-delundel'] ) ) . ' '; |
| 619 | 636 | // Otherwise, show the link... |
| 620 | 637 | } else { |
| 621 | 638 | $query = array( |