Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable27] fix(SystemTagManager): Use truncated tagName in getTag and updateTag #39596

Merged
merged 1 commit into from Aug 2, 2023
Merged

[stable27] fix(SystemTagManager): Use truncated tagName in getTag and updateTag #39596

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 8 additions & 4 deletions lib/private/SystemTag/SystemTagManager.php
View file
Open in desktop
Expand Up @@ -177,8 +177,10 @@ public function getAllTags($visibilityFilter = null, $nameSearchPattern = null):
* {@inheritdoc}
*/
public function getTag(string $tagName, bool $userVisible, bool $userAssignable): ISystemTag {
// Length of name column is 64
$truncatedTagName = substr($tagName, 0, 64);
$result = $this->selectTagQuery
->setParameter('name', $tagName)
->setParameter('name', $truncatedTagName)
->setParameter('visibility', $userVisible ? 1 : 0)
->setParameter('editable', $userAssignable ? 1 : 0)
->execute();
Expand All @@ -187,7 +189,7 @@ public function getTag(string $tagName, bool $userVisible, bool $userAssignable)
$result->closeCursor();
if (!$row) {
throw new TagNotFoundException(
'Tag ("' . $tagName . '", '. $userVisible . ', ' . $userAssignable . ') does not exist'
'Tag ("' . $truncatedTagName . '", '. $userVisible . ', ' . $userAssignable . ') does not exist'
);
}

Expand Down Expand Up @@ -247,9 +249,11 @@ public function updateTag(string $tagId, string $newName, bool $userVisible, boo
}

$beforeUpdate = array_shift($tags);
// Length of name column is 64
$truncatedNewName = substr($newName, 0, 64);
$afterUpdate = new SystemTag(
$tagId,
$newName,
$truncatedNewName,
$userVisible,
$userAssignable
);
Expand All @@ -260,7 +264,7 @@ public function updateTag(string $tagId, string $newName, bool $userVisible, boo
->set('visibility', $query->createParameter('visibility'))
->set('editable', $query->createParameter('editable'))
->where($query->expr()->eq('id', $query->createParameter('tagid')))
->setParameter('name', $newName)
->setParameter('name', $truncatedNewName)
->setParameter('visibility', $userVisible ? 1 : 0)
->setParameter('editable', $userAssignable ? 1 : 0)
->setParameter('tagid', $tagId);
Expand Down