| Index: branches/wmf-deployment/includes/specials/SpecialContributions.php |
| — | — | @@ -245,7 +245,7 @@ |
| 246 | 246 | ); |
| 247 | 247 | } |
| 248 | 248 | } |
| 249 | | - |
| | 249 | + |
| 250 | 250 | // Old message 'contribsub' had one parameter, but that doesn't work for |
| 251 | 251 | // languages that want to put the "for" bit right after $user but before |
| 252 | 252 | // $links. If 'contribsub' is around, use it for reverse compatibility, |
| — | — | @@ -433,13 +433,9 @@ |
| 434 | 434 | |
| 435 | 435 | function __construct( $target, $namespace = false, $year = false, $month = false, $tagFilter = false ) { |
| 436 | 436 | parent::__construct(); |
| 437 | | - |
| 438 | | - $msgs = array( 'uctop', 'diff', 'newarticle', 'rollbacklink', 'diff', 'hist', 'rev-delundel', 'pipe-separator' ); |
| 439 | | - |
| 440 | | - foreach( $msgs as $msg ) { |
| 441 | | - $this->messages[$msg] = wfMsgExt( $msg, 'escapenoentities' ); |
| | 437 | + foreach( explode( ' ', 'uctop diff newarticle rollbacklink diff hist rev-delundel pipe-separator' ) as $msg ) { |
| | 438 | + $this->messages[$msg] = wfMsgExt( $msg, array( 'escape') ); |
| 442 | 439 | } |
| 443 | | - |
| 444 | 440 | $this->target = $target; |
| 445 | 441 | $this->namespace = $namespace; |
| 446 | 442 | $this->tagFilter = $tagFilter; |
| — | — | @@ -480,16 +476,14 @@ |
| 481 | 477 | 'options' => array( 'USE INDEX' => array('revision' => $index) ), |
| 482 | 478 | 'join_conds' => $join_cond |
| 483 | 479 | ); |
| 484 | | - |
| 485 | | - ChangeTags::modifyDisplayQuery( |
| 486 | | - $queryInfo['tables'], |
| 487 | | - $queryInfo['fields'], |
| 488 | | - $queryInfo['conds'], |
| 489 | | - $queryInfo['join_conds'], |
| 490 | | - $queryInfo['options'], |
| 491 | | - $this->tagFilter |
| 492 | | - ); |
| 493 | | - |
| | 480 | + |
| | 481 | + ChangeTags::modifyDisplayQuery( $queryInfo['tables'], |
| | 482 | + $queryInfo['fields'], |
| | 483 | + $queryInfo['conds'], |
| | 484 | + $queryInfo['join_conds'], |
| | 485 | + $queryInfo['options'], |
| | 486 | + $this->tagFilter ); |
| | 487 | + |
| 494 | 488 | wfRunHooks( 'ContribsPager::getQueryInfo', array( &$this, &$queryInfo ) ); |
| 495 | 489 | return $queryInfo; |
| 496 | 490 | } |
| — | — | @@ -564,13 +558,12 @@ |
| 565 | 559 | if( $row->rev_id == $row->page_latest ) { |
| 566 | 560 | $topmarktext .= '<span class="mw-uctop">' . $this->messages['uctop'] . '</span>'; |
| 567 | 561 | if( !$row->page_is_new ) { |
| 568 | | - $difflink = $sk->linkKnown( |
| | 562 | + $difftext .= '(' . $sk->linkKnown( |
| 569 | 563 | $page, |
| 570 | 564 | $this->messages['diff'], |
| 571 | 565 | array(), |
| 572 | 566 | array( 'diff' => 0 ) |
| 573 | | - ); |
| 574 | | - $difftext .= wfMsg( 'parentheses', $difflink ); |
| | 567 | + ) . ')'; |
| 575 | 568 | # Add rollback link |
| 576 | 569 | if( $page->quickUserCan( 'rollback') && $page->quickUserCan( 'edit' ) ) { |
| 577 | 570 | $topmarktext .= ' '.$sk->generateRollback( $rev ); |
| — | — | @@ -615,7 +608,7 @@ |
| 616 | 609 | |
| 617 | 610 | if( $this->target == 'newbies' ) { |
| 618 | 611 | $userlink = ' . . ' . $sk->userLink( $row->rev_user, $row->rev_user_text ); |
| 619 | | - $userlink .= ' ' . wfMsgExt( 'parentheses', 'escapenoentities', $sk->userTalkLink( $row->rev_user, $row->rev_user_text ) ) . ' '; |
| | 612 | + $userlink .= ' (' . $sk->userTalkLink( $row->rev_user, $row->rev_user_text ) . ') '; |
| 620 | 613 | } else { |
| 621 | 614 | $userlink = ''; |
| 622 | 615 | } |
| — | — | @@ -637,7 +630,7 @@ |
| 638 | 631 | // If revision was hidden from sysops |
| 639 | 632 | if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) { |
| 640 | 633 | $del = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), |
| 641 | | - wfMsg( 'parentheses', $this->messages['rev-delundel'] ) ) . ' '; |
| | 634 | + '(' . $this->messages['rev-delundel'] . ')' ) . ' '; |
| 642 | 635 | // Otherwise, show the link... |
| 643 | 636 | } else { |
| 644 | 637 | $query = array( |
| Property changes on: branches/wmf-deployment/includes/specials/SpecialContributions.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 645 | 638 | - /branches/REL1_15/phase3/includes/specials/SpecialContributions.php:51646 |
| /branches/wmf-deployment/includes/specials/SpecialContributions.php:53381 |
| /trunk/phase3/includes/specials/SpecialContributions.php:56188,56468,57154-57447,57478 |
| 646 | 639 | + /branches/REL1_15/phase3/includes/specials/SpecialContributions.php:51646 |
| /branches/wmf-deployment/includes/specials/SpecialContributions.php:53381 |
| /trunk/phase3/includes/specials/SpecialContributions.php:56188,56468,57154-57447,57478,57489 |