From: This, that and the other <at.light@live.com.au>
Date: Sun, 7 Aug 2016 04:56:19 +0000 (+1000)
Subject: Fix display of action table cells on Special:Tags
X-Git-Tag: 1.31.0-rc.0~6064^2
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=62c3b98f296bcc68f25404ab6f9fdc4809fa3c8a;p=lhc%2Fweb%2Fwiklou.git

Fix display of action table cells on Special:Tags

Users with the managechangetags right but without the deletechangetags
right saw a jagged table, with cells missing from the Actions column.

Also, users with the deletechangetags right but without the
managechangetags didn't see a column header for the Actions column.

Change-Id: I66198cfb181ba8616a98b16f84eaa843f0352f70
---

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