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

diff --combined includes/specials/SpecialTags.php
index e957b3c,3dac56b..47bed62
--- 1/includes/specials/SpecialTags.php
--- 2/includes/specials/SpecialTags.php
+++ b/includes/specials/SpecialTags.php
@@@ -128,7 -128,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 -143,7 +142,7 @@@
                        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() ) :
                                '' )
@@@ -175,13 -176,12 +175,13 @@@
                $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();
                }
@@@ -191,9 -191,9 +191,9 @@@
                $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();
                }
@@@ -217,16 -217,14 +217,16 @@@
                $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
@@@ -237,9 -235,8 +237,9 @@@
  
                // delete
                if ( $showDeleteActions && ChangeTags::canDeleteTag( $tag )->isOK() ) {
 -                      $actionLinks[] = Linker::linkKnown( $this->getPageTitle( 'delete' ),
 -                              $this->msg( 'tags-delete' )->escaped(),
 +                      $actionLinks[] = $linkRenderer->makeKnownLink(
 +                              $this->getPageTitle( 'delete' ),
 +                              $this->msg( 'tags-delete' )->text(),
                                [],
                                [ 'tag' => $tag ] );
                }
@@@ -248,25 -245,23 +248,25 @@@
  
                        // 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 ( $actionLinks ) {
+               if ( $showDeleteActions || $showManageActions ) {
                        $newRow .= Xml::tags( 'td', null, $this->getLanguage()->pipeList( $actionLinks ) );
                }