X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialTags.php;h=898d170642e2556d5995870715906bc4558f2db3;hb=951c1016edbf1325119b814cd0e6a30e104868b4;hp=e957b3c5da160c8093a87c02f982a731ee5d3b4c;hpb=2442464754ab540163098e1f3c30b0996302bb7f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialTags.php b/includes/specials/SpecialTags.php
index e957b3c5da..898d170642 100644
--- a/includes/specials/SpecialTags.php
+++ b/includes/specials/SpecialTags.php
@@ -34,14 +34,14 @@ class SpecialTags extends SpecialPage {
 	protected $explicitlyDefinedTags;
 
 	/**
-	 * @var array List of extension defined tags
+	 * @var array List of software defined tags
 	 */
-	protected $extensionDefinedTags;
+	protected $softwareDefinedTags;
 
 	/**
-	 * @var array List of extension activated tags
+	 * @var array List of software activated tags
 	 */
-	protected $extensionActivatedTags;
+	protected $softwareActivatedTags;
 
 	function __construct() {
 		parent::__construct( 'Tags' );
@@ -110,7 +110,7 @@ class SpecialTags extends SpecialPage {
 			// continuing with this, as the user is just going to end up getting sent
 			// somewhere else. Additionally, if we keep going here, we end up
 			// populating the memcache of tag data (see ChangeTags::listDefinedTags)
-			// with out-of-date data from the slave, because the slave hasn't caught
+			// with out-of-date data from the replica DB, because the replica DB hasn't caught
 			// up to the fact that a new tag has been created as part of an implicit,
 			// as yet uncommitted transaction on master.
 			if ( $out->getRedirect() !== '' ) {
@@ -124,11 +124,11 @@ class SpecialTags extends SpecialPage {
 		// Used in #doTagRow()
 		$this->explicitlyDefinedTags = array_fill_keys(
 			ChangeTags::listExplicitlyDefinedTags(), true );
-		$this->extensionDefinedTags = array_fill_keys(
-			ChangeTags::listExtensionDefinedTags(), true );
+		$this->softwareDefinedTags = array_fill_keys(
+			ChangeTags::listSoftwareDefinedTags(), true );
 
 		// List all defined tags, even if they were never applied
-		$definedTags = array_keys( $this->explicitlyDefinedTags + $this->extensionDefinedTags );
+		$definedTags = array_keys( $this->explicitlyDefinedTags + $this->softwareDefinedTags );
 
 		// Show header only if there exists atleast one tag
 		if ( !$tagStats && !$definedTags ) {
@@ -142,15 +142,15 @@ 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() ) :
 				'' )
 		);
 
 		// Used in #doTagRow()
-		$this->extensionActivatedTags = array_fill_keys(
-			ChangeTags::listExtensionActivatedTags(), true );
+		$this->softwareActivatedTags = array_fill_keys(
+			ChangeTags::listSoftwareActivatedTags(), true );
 
 		// Insert tags that have been applied at least once
 		foreach ( $tagStats as $tag => $hitcount ) {
@@ -200,9 +200,10 @@ class SpecialTags extends SpecialPage {
 		$newRow .= Xml::tags( 'td', null, $desc );
 
 		$sourceMsgs = [];
-		$isExtension = isset( $this->extensionDefinedTags[$tag] );
+		$isSoftware = isset( $this->softwareDefinedTags[$tag] );
 		$isExplicit = isset( $this->explicitlyDefinedTags[$tag] );
-		if ( $isExtension ) {
+		if ( $isSoftware ) {
+			// TODO: Rename this message
 			$sourceMsgs[] = $this->msg( 'tags-source-extension' )->escaped();
 		}
 		if ( $isExplicit ) {
@@ -213,7 +214,7 @@ class SpecialTags extends SpecialPage {
 		}
 		$newRow .= Xml::tags( 'td', null, implode( Xml::element( 'br' ), $sourceMsgs ) );
 
-		$isActive = $isExplicit || isset( $this->extensionActivatedTags[$tag] );
+		$isActive = $isExplicit || isset( $this->softwareActivatedTags[$tag] );
 		$activeMsg = ( $isActive ? 'tags-active-yes' : 'tags-active-no' );
 		$newRow .= Xml::tags( 'td', null, $this->msg( $activeMsg )->escaped() );
 
@@ -266,7 +267,7 @@ class SpecialTags extends SpecialPage {
 
 		}
 
-		if ( $actionLinks ) {
+		if ( $showDeleteActions || $showManageActions ) {
 			$newRow .= Xml::tags( 'td', null, $this->getLanguage()->pipeList( $actionLinks ) );
 		}
 
@@ -357,9 +358,9 @@ class SpecialTags extends SpecialPage {
 		$preText .= $this->msg( 'tags-delete-explanation-warning', $tag )->parseAsBlock();
 
 		// see if the tag is in use
-		$this->extensionActivatedTags = array_fill_keys(
-			ChangeTags::listExtensionActivatedTags(), true );
-		if ( isset( $this->extensionActivatedTags[$tag] ) ) {
+		$this->softwareActivatedTags = array_fill_keys(
+			ChangeTags::listSoftwareActivatedTags(), true );
+		if ( isset( $this->softwareActivatedTags[$tag] ) ) {
 			$preText .= $this->msg( 'tags-delete-explanation-active', $tag )->parseAsBlock();
 		}