Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix ChangeTags functions after split of definedTags from tagUsageStatistics

Browse source 
This provides fixes to the can*Tag functions of ChangeTags following the
removal of listDefinedTags from the tagUsageStatistics function in
I410e9a935bd202faac92f430c0b4dae1a48e2d21.

Change-Id: I087bb7107ae0c83946f8e2f417a6121bb2da18b4
This commit is contained in:
cenarium 2015-06-17 15:22:37 +02:00
parent f4770c54d4
commit d2344425f9
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
includes/changetags/ChangeTags.php
View file

@ -749,12 +749,6 @@ class ChangeTags {
return Status::newFatal( 'tags-manage-no-permission' );
}
// non-existing tags cannot be activated
$tagUsage = self::tagUsageStatistics();
if ( !isset( $tagUsage[$tag] ) ) {
return Status::newFatal( 'tags-activate-not-found', $tag );
}
// defined tags cannot be activated (a defined tag is either extension-
// defined, in which case the extension chooses whether or not to active it;
// or user-defined, in which case it is considered active)
@ -763,6 +757,12 @@ class ChangeTags {
return Status::newFatal( 'tags-activate-not-allowed', $tag );
}
// non-existing tags cannot be activated
$tagUsage = self::tagUsageStatistics();
if ( !isset( $tagUsage[$tag] ) ) { // we already know the tag is undefined
return Status::newFatal( 'tags-activate-not-found', $tag );
}
return Status::newGood();
}
@ -887,7 +887,7 @@ class ChangeTags {
// does the tag already exist?
$tagUsage = self::tagUsageStatistics();
if ( isset( $tagUsage[$tag] ) ) {
if ( isset( $tagUsage[$tag] ) || in_array( $tag, self::listDefinedTags() ) ) {
return Status::newFatal( 'tags-create-already-exists', $tag );
}
@ -997,11 +997,11 @@ class ChangeTags {
return Status::newFatal( 'tags-manage-no-permission' );
}
if ( !isset( $tagUsage[$tag] ) ) {
if ( !isset( $tagUsage[$tag] ) && !in_array( $tag, self::listDefinedTags() ) ) {
return Status::newFatal( 'tags-delete-not-found', $tag );
}
if ( $tagUsage[$tag] > self::MAX_DELETE_USES ) {
if ( isset( $tagUsage[$tag] ) && $tagUsage[$tag] > self::MAX_DELETE_USES ) {
return Status::newFatal( 'tags-delete-too-many-uses', $tag, self::MAX_DELETE_USES );
}
@ -1046,6 +1046,7 @@ class ChangeTags {
// store the tag usage statistics
$tagUsage = self::tagUsageStatistics();
$hitcount = isset( $tagUsage[$tag] ) ? $tagUsage[$tag] : 0;
// do it!
$deleteResult = self::deleteTagEverywhere( $tag );
@ -1054,7 +1055,7 @@ class ChangeTags {
}
// log it
$logId = self::logTagManagementAction( 'delete', $tag, $reason, $user, $tagUsage[$tag] );
$logId = self::logTagManagementAction( 'delete', $tag, $reason, $user, $hitcount );
$deleteResult->value = $logId;
return $deleteResult;
}