From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 15 Aug 2016 20:46:54 +0000 (+0000)
Subject: Merge "Fix display of action table cells on Special:Tags"
X-Git-Tag: 1.31.0-rc.0~6064
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=f82b0e76306a9feca014e563a5fac0688cf876dc;hp=0aa0a68aa9aac7cebd95a8d9beba55eaf7403432;p=lhc%2Fweb%2Fwiklou.git

Merge "Fix display of action table cells on Special:Tags"
---

diff --git a/includes/specials/SpecialTags.php b/includes/specials/SpecialTags.php
index e957b3c5da..47bed62642 100644
--- a/includes/specials/SpecialTags.php
+++ b/includes/specials/SpecialTags.php
@@ -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() ) :
 				'' )
@@ -266,7 +266,7 @@ class SpecialTags extends SpecialPage {
 
 		}
 
-		if ( $actionLinks ) {
+		if ( $showDeleteActions || $showManageActions ) {
 			$newRow .= Xml::tags( 'td', null, $this->getLanguage()->pipeList( $actionLinks ) );
 		}