dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix assigning void return value to a variable"
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialTags.php
diff --git
a/includes/specials/SpecialTags.php
b/includes/specials/SpecialTags.php
index
5e5ed25
..
ea40cb8
100644
(file)
--- a/
includes/specials/SpecialTags.php
+++ b/
includes/specials/SpecialTags.php
@@
-34,14
+34,14
@@
class SpecialTags extends SpecialPage {
protected $explicitlyDefinedTags;
/**
protected $explicitlyDefinedTags;
/**
- * @var array List of
extension
defined tags
+ * @var array List of
software
defined tags
*/
*/
- protected $
extension
DefinedTags;
+ protected $
software
DefinedTags;
/**
/**
- * @var array List of
extension
activated tags
+ * @var array List of
software
activated tags
*/
*/
- protected $
extension
ActivatedTags;
+ protected $
software
ActivatedTags;
function __construct() {
parent::__construct( 'Tags' );
function __construct() {
parent::__construct( 'Tags' );
@@
-124,11
+124,11
@@
class SpecialTags extends SpecialPage {
// Used in #doTagRow()
$this->explicitlyDefinedTags = array_fill_keys(
ChangeTags::listExplicitlyDefinedTags(), true );
// Used in #doTagRow()
$this->explicitlyDefinedTags = array_fill_keys(
ChangeTags::listExplicitlyDefinedTags(), true );
- $this->
extension
DefinedTags = array_fill_keys(
- ChangeTags::list
Extension
DefinedTags(), true );
+ $this->
software
DefinedTags = array_fill_keys(
+ ChangeTags::list
Software
DefinedTags(), true );
// List all defined tags, even if they were never applied
// List all defined tags, even if they were never applied
- $definedTags = array_keys( $this->explicitlyDefinedTags + $this->
extension
DefinedTags );
+ $definedTags = array_keys( $this->explicitlyDefinedTags + $this->
software
DefinedTags );
// Show header only if there exists atleast one tag
if ( !$tagStats && !$definedTags ) {
// Show header only if there exists atleast one tag
if ( !$tagStats && !$definedTags ) {
@@
-149,8
+149,8
@@
class SpecialTags extends SpecialPage {
);
// Used in #doTagRow()
);
// Used in #doTagRow()
- $this->
extension
ActivatedTags = array_fill_keys(
- ChangeTags::list
Extension
ActivatedTags(), true );
+ $this->
software
ActivatedTags = array_fill_keys(
+ ChangeTags::list
Software
ActivatedTags(), true );
// Insert tags that have been applied at least once
foreach ( $tagStats as $tag => $hitcount ) {
// Insert tags that have been applied at least once
foreach ( $tagStats as $tag => $hitcount ) {
@@
-176,7
+176,7
@@
class SpecialTags extends SpecialPage {
$newRow .= Xml::tags( 'td', null, Xml::element( 'code', null, $tag ) );
$linkRenderer = $this->getLinkRenderer();
$newRow .= Xml::tags( 'td', null, Xml::element( 'code', null, $tag ) );
$linkRenderer = $this->getLinkRenderer();
- $disp = ChangeTags::tagDescription( $tag );
+ $disp = ChangeTags::tagDescription( $tag
, $this->getContext()
);
if ( $showEditLinks ) {
$disp .= ' ';
$editLink = $linkRenderer->makeLink(
if ( $showEditLinks ) {
$disp .= ' ';
$editLink = $linkRenderer->makeLink(
@@
-200,9
+200,10
@@
class SpecialTags extends SpecialPage {
$newRow .= Xml::tags( 'td', null, $desc );
$sourceMsgs = [];
$newRow .= Xml::tags( 'td', null, $desc );
$sourceMsgs = [];
- $is
Extension = isset( $this->extension
DefinedTags[$tag] );
+ $is
Software = isset( $this->software
DefinedTags[$tag] );
$isExplicit = isset( $this->explicitlyDefinedTags[$tag] );
$isExplicit = isset( $this->explicitlyDefinedTags[$tag] );
- if ( $isExtension ) {
+ if ( $isSoftware ) {
+ // TODO: Rename this message
$sourceMsgs[] = $this->msg( 'tags-source-extension' )->escaped();
}
if ( $isExplicit ) {
$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 ) );
}
$newRow .= Xml::tags( 'td', null, implode( Xml::element( 'br' ), $sourceMsgs ) );
- $isActive = $isExplicit || isset( $this->
extension
ActivatedTags[$tag] );
+ $isActive = $isExplicit || isset( $this->
software
ActivatedTags[$tag] );
$activeMsg = ( $isActive ? 'tags-active-yes' : 'tags-active-no' );
$newRow .= Xml::tags( 'td', null, $this->msg( $activeMsg )->escaped() );
$activeMsg = ( $isActive ? 'tags-active-yes' : 'tags-active-no' );
$newRow .= Xml::tags( 'td', null, $this->msg( $activeMsg )->escaped() );
@@
-357,9
+358,9
@@
class SpecialTags extends SpecialPage {
$preText .= $this->msg( 'tags-delete-explanation-warning', $tag )->parseAsBlock();
// see if the tag is in use
$preText .= $this->msg( 'tags-delete-explanation-warning', $tag )->parseAsBlock();
// see if the tag is in use
- $this->
extension
ActivatedTags = array_fill_keys(
- ChangeTags::list
Extension
ActivatedTags(), true );
- if ( isset( $this->
extension
ActivatedTags[$tag] ) ) {
+ $this->
software
ActivatedTags = array_fill_keys(
+ ChangeTags::list
Software
ActivatedTags(), true );
+ if ( isset( $this->
software
ActivatedTags[$tag] ) ) {
$preText .= $this->msg( 'tags-delete-explanation-active', $tag )->parseAsBlock();
}
$preText .= $this->msg( 'tags-delete-explanation-active', $tag )->parseAsBlock();
}