X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialTags.php;h=47bed626428a45e08ad74501eda620d21bdd5ca1;hb=f82b0e76306a9feca014e563a5fac0688cf876dc;hp=e79fd6ee0f9c3f38096841e9f0945d95ac5dbe56;hpb=1024249502ed39f5a5d1871b3112de71186e4432;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialTags.php b/includes/specials/SpecialTags.php
index e79fd6ee0f..47bed62642 100644
--- a/includes/specials/SpecialTags.php
+++ b/includes/specials/SpecialTags.php
@@ -77,6 +77,7 @@ class SpecialTags extends SpecialPage {
 
 		$user = $this->getUser();
 		$userCanManage = $user->isAllowed( 'managechangetags' );
+		$userCanDelete = $user->isAllowed( 'deletechangetags' );
 		$userCanEditInterface = $user->isAllowed( 'editinterface' );
 
 		// Show form to create a tag
@@ -127,8 +128,7 @@ class SpecialTags extends SpecialPage {
 			ChangeTags::listExtensionDefinedTags(), true );
 
 		// List all defined tags, even if they were never applied
-		$definedTags = array_keys( array_merge(
-			$this->explicitlyDefinedTags, $this->extensionDefinedTags ) );
+		$definedTags = array_keys( $this->explicitlyDefinedTags + $this->extensionDefinedTags );
 
 		// Show header only if there exists atleast one tag
 		if ( !$tagStats && !$definedTags ) {
@@ -142,7 +142,7 @@ class SpecialTags extends SpecialPage {
 			Xml::tags( 'th', null, $this->msg( 'tags-source-header' )->parse() ) .
 			Xml::tags( 'th', null, $this->msg( 'tags-active-header' )->parse() ) .
 			Xml::tags( 'th', null, $this->msg( 'tags-hitcount-header' )->parse() ) .
-			( $userCanManage ?
+			( ( $userCanManage || $userCanDelete ) ?
 				Xml::tags( 'th', [ 'class' => 'unsortable' ],
 					$this->msg( 'tags-actions-header' )->parse() ) :
 				'' )
@@ -154,12 +154,13 @@ class SpecialTags extends SpecialPage {
 
 		// Insert tags that have been applied at least once
 		foreach ( $tagStats as $tag => $hitcount ) {
-			$html .= $this->doTagRow( $tag, $hitcount, $userCanManage, $userCanEditInterface );
+			$html .= $this->doTagRow( $tag, $hitcount, $userCanManage,
+				$userCanDelete, $userCanEditInterface );
 		}
 		// Insert tags defined somewhere but never applied
 		foreach ( $definedTags as $tag ) {
 			if ( !isset( $tagStats[$tag] ) ) {
-				$html .= $this->doTagRow( $tag, 0, $userCanManage, $userCanEditInterface );
+				$html .= $this->doTagRow( $tag, 0, $userCanManage, $userCanDelete, $userCanEditInterface );
 			}
 		}
 
@@ -170,16 +171,17 @@ class SpecialTags extends SpecialPage {
 		) );
 	}
 
-	function doTagRow( $tag, $hitcount, $showActions, $showEditLinks ) {
+	function doTagRow( $tag, $hitcount, $showManageActions, $showDeleteActions, $showEditLinks ) {
 		$newRow = '';
 		$newRow .= Xml::tags( 'td', null, Xml::element( 'code', null, $tag ) );
 
+		$linkRenderer = $this->getLinkRenderer();
 		$disp = ChangeTags::tagDescription( $tag );
 		if ( $showEditLinks ) {
 			$disp .= ' ';
-			$editLink = Linker::link(
+			$editLink = $linkRenderer->makeLink(
 				$this->msg( "tag-$tag" )->inContentLanguage()->getTitle(),
-				$this->msg( 'tags-edit' )->escaped()
+				$this->msg( 'tags-edit' )->text()
 			);
 			$disp .= $this->msg( 'parentheses' )->rawParams( $editLink )->escaped();
 		}
@@ -189,9 +191,9 @@ class SpecialTags extends SpecialPage {
 		$desc = !$msg->exists() ? '' : $msg->parse();
 		if ( $showEditLinks ) {
 			$desc .= ' ';
-			$editDescLink = Linker::link(
+			$editDescLink = $linkRenderer->makeLink(
 				$this->msg( "tag-$tag-description" )->inContentLanguage()->getTitle(),
-				$this->msg( 'tags-edit' )->escaped()
+				$this->msg( 'tags-edit' )->text()
 			);
 			$desc .= $this->msg( 'parentheses' )->rawParams( $editDescLink )->escaped();
 		}
@@ -215,47 +217,56 @@ class SpecialTags extends SpecialPage {
 		$activeMsg = ( $isActive ? 'tags-active-yes' : 'tags-active-no' );
 		$newRow .= Xml::tags( 'td', null, $this->msg( $activeMsg )->escaped() );
 
-		$hitcountLabel = $this->msg( 'tags-hitcount' )->numParams( $hitcount )->escaped();
+		$hitcountLabelMsg = $this->msg( 'tags-hitcount' )->numParams( $hitcount );
 		if ( $this->getConfig()->get( 'UseTagFilter' ) ) {
-			$hitcountLabel = Linker::link(
+			$hitcountLabel = $linkRenderer->makeLink(
 				SpecialPage::getTitleFor( 'Recentchanges' ),
-				$hitcountLabel,
+				$hitcountLabelMsg->text(),
 				[],
 				[ 'tagfilter' => $tag ]
 			);
+		} else {
+			$hitcountLabel = $hitcountLabelMsg->escaped();
 		}
 
 		// add raw $hitcount for sorting, because tags-hitcount contains numbers and letters
 		$newRow .= Xml::tags( 'td', [ 'data-sort-value' => $hitcount ], $hitcountLabel );
 
 		// actions
-		if ( $showActions ) { // we've already checked that the user had the requisite userright
-			$actionLinks = [];
+		$actionLinks = [];
 
-			// delete
-			if ( ChangeTags::canDeleteTag( $tag )->isOK() ) {
-				$actionLinks[] = Linker::linkKnown( $this->getPageTitle( 'delete' ),
-					$this->msg( 'tags-delete' )->escaped(),
-					[],
-					[ 'tag' => $tag ] );
-			}
+		// delete
+		if ( $showDeleteActions && ChangeTags::canDeleteTag( $tag )->isOK() ) {
+			$actionLinks[] = $linkRenderer->makeKnownLink(
+				$this->getPageTitle( 'delete' ),
+				$this->msg( 'tags-delete' )->text(),
+				[],
+				[ 'tag' => $tag ] );
+		}
+
+		if ( $showManageActions ) { // we've already checked that the user had the requisite userright
 
 			// activate
 			if ( ChangeTags::canActivateTag( $tag )->isOK() ) {
-				$actionLinks[] = Linker::linkKnown( $this->getPageTitle( 'activate' ),
-					$this->msg( 'tags-activate' )->escaped(),
+				$actionLinks[] = $linkRenderer->makeKnownLink(
+					$this->getPageTitle( 'activate' ),
+					$this->msg( 'tags-activate' )->text(),
 					[],
 					[ 'tag' => $tag ] );
 			}
 
 			// deactivate
 			if ( ChangeTags::canDeactivateTag( $tag )->isOK() ) {
-				$actionLinks[] = Linker::linkKnown( $this->getPageTitle( 'deactivate' ),
-					$this->msg( 'tags-deactivate' )->escaped(),
+				$actionLinks[] = $linkRenderer->makeKnownLink(
+					$this->getPageTitle( 'deactivate' ),
+					$this->msg( 'tags-deactivate' )->text(),
 					[],
 					[ 'tag' => $tag ] );
 			}
 
+		}
+
+		if ( $showDeleteActions || $showManageActions ) {
 			$newRow .= Xml::tags( 'td', null, $this->getLanguage()->pipeList( $actionLinks ) );
 		}
 
@@ -319,8 +330,8 @@ class SpecialTags extends SpecialPage {
 
 	protected function showDeleteTagForm( $tag ) {
 		$user = $this->getUser();
-		if ( !$user->isAllowed( 'managechangetags' ) ) {
-			throw new PermissionsError( 'managechangetags' );
+		if ( !$user->isAllowed( 'deletechangetags' ) ) {
+			throw new PermissionsError( 'deletechangetags' );
 		}
 
 		$out = $this->getOutput();