X-Git-Url: http://git.cyclocoop.org/%22%20.%20%20%20%24self2%20.%20%20%20%22&var_mode_affiche=boucle?a=blobdiff_plain;f=includes%2Fspecials%2Fpagers%2FContribsPager.php;h=e5831089928c202550c4c0a1ea3cba95c2dd5d58;hb=2ffff73a46c29cdad1cbf59063f4dd75debd3b4c;hp=5126bad1a8910d38a910dbc2a9bc930cea594b60;hpb=c584722cc2e3d33edae58d46c2149063b3fc6d72;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/pagers/ContribsPager.php b/includes/specials/pagers/ContribsPager.php
index 5126bad1a8..e583108992 100644
--- a/includes/specials/pagers/ContribsPager.php
+++ b/includes/specials/pagers/ContribsPager.php
@@ -26,6 +26,7 @@
 use MediaWiki\MediaWikiServices;
 use Wikimedia\Rdbms\ResultWrapper;
 use Wikimedia\Rdbms\FakeResultWrapper;
+use Wikimedia\Rdbms\IDatabase;
 
 class ContribsPager extends ReverseChronologicalPager {
 
@@ -44,6 +45,11 @@ class ContribsPager extends ReverseChronologicalPager {
 	 */
 	protected $mParentLens;
 
+	/**
+	 * @var TemplateParser
+	 */
+	protected $templateParser;
+
 	function __construct( IContextSource $context, array $options ) {
 		parent::__construct( $context );
 
@@ -79,6 +85,7 @@ class ContribsPager extends ReverseChronologicalPager {
 		// queries should use a regular replica DB since the lookup pattern is not all by user.
 		$this->mDbSecondary = wfGetDB( DB_REPLICA ); // any random replica DB
 		$this->mDb = wfGetDB( DB_REPLICA, 'contributions' );
+		$this->templateParser = new TemplateParser();
 	}
 
 	function getDefaultQuery() {
@@ -227,10 +234,8 @@ class ContribsPager extends ReverseChronologicalPager {
 					'LEFT JOIN', [
 						'ug_user = rev_user',
 						'ug_group' => $groupsWithBotPermission,
-						$this->getConfig()->get( 'DisableUserGroupExpiry' ) ?
-							'1' :
-							'ug_expiry IS NULL OR ug_expiry >= ' .
-								$this->mDb->addQuotes( $this->mDb->timestamp() )
+						'ug_expiry IS NULL OR ug_expiry >= ' .
+							$this->mDb->addQuotes( $this->mDb->timestamp() )
 					]
 				];
 			}
@@ -460,14 +465,13 @@ class ContribsPager extends ReverseChronologicalPager {
 			}
 
 			# Show user names for /newbies as there may be different users.
-			# Note that we already excluded rows with hidden user names.
-			if ( $this->contribs == 'newbie' ) {
+			# Note that only unprivileged users have rows with hidden user names excluded.
+			$userlink = '';
+			if ( $this->contribs == 'newbie' && !$rev->isDeleted( Revision::DELETED_USER ) ) {
 				$userlink = ' . . ' . $lang->getDirMark()
 					. Linker::userLink( $rev->getUser(), $rev->getUserText() );
 				$userlink .= ' ' . $this->msg( 'parentheses' )->rawParams(
-						Linker::userTalkLink( $rev->getUser(), $rev->getUserText() ) )->escaped() . ' ';
-			} else {
-				$userlink = '';
+					Linker::userTalkLink( $rev->getUser(), $rev->getUserText() ) )->escaped() . ' ';
 			}
 
 			$flags = [];
@@ -517,8 +521,7 @@ class ContribsPager extends ReverseChronologicalPager {
 					$this->msg( 'rev-deleted-user-contribs' )->escaped();
 			}
 
-			$templateParser = new TemplateParser();
-			$ret = $templateParser->processTemplate(
+			$ret = $this->templateParser->processTemplate(
 				'SpecialContributionsLine',
 				$templateParams
 			);