Skip to content

fix(core): preserve UTF-8 system tag names #63987

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

Open
HsukqiLee wants to merge 2 commits into
base: master
Choose a base branch
from
+23 −4
Open

fix(core): preserve UTF-8 system tag names #63987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bac3c99
fix(core): preserve UTF-8 system tag names
HsukqiLee Sep 3, 2026
43442eb
test(core): cover UTF-8 system tag updates
HsukqiLee Sep 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/private/SystemTag/SystemTagManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public function getAllTags($visibilityFilter = null, $nameSearchPattern = null):
#[\Override]
public function getTag(string $tagName, bool $userVisible, bool $userAssignable): ISystemTag {
// Length of name column is 64
$truncatedTagName = substr($tagName, 0, 64);
$truncatedTagName = mb_strcut($tagName, 0, 64, 'UTF-8');
$result = $this->selectTagQuery
->setParameter('name', $truncatedTagName)
->setParameter('visibility', $userVisible ? 1 : 0)
Expand Down Expand Up @@ -185,7 +185,7 @@ public function createTag(string $tagName, bool $userVisible, bool $userAssignab
}

// Length of name column is 64
$truncatedTagName = substr($tagName, 0, 64);
$truncatedTagName = mb_strcut($tagName, 0, 64, 'UTF-8');

@icewind1991 icewind1991 Sep 23, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why mb_strcut and not mb_substr?

$query = $this->connection->getQueryBuilder();
$query->insert(self::TAG_TABLE)
->values([
Expand Down Expand Up @@ -251,7 +251,7 @@ public function updateTag(
$newName = Util::sanitizeWordsAndEmojis($newName);

// Length of name column is 64
$truncatedNewName = substr($newName, 0, 64);
$truncatedNewName = mb_strcut($newName, 0, 64, 'UTF-8');
$afterUpdate = new SystemTag(
$tagId,
$truncatedNewName,
Expand Down
21 changes: 20 additions & 1 deletion tests/lib/SystemTag/SystemTagManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,26 @@ public function testCreateDuplicateWithDifferentFlags(): void {

public function testCreateOverlongName(): void {
$tag = $this->tagManager->createTag('Zona circundante do Palácio Nacional da Ajuda (Jardim das Damas, Salão de Física, Torre Sineira, Paço Velho e Jardim Botânico)', true, true);
$this->assertSame('Zona circundante do Palácio Nacional da Ajuda (Jardim das Damas', $tag->getName()); // 63 characters but 64 bytes due to "á"
$this->assertSame('Zona circundante do Palácio Nacional da Ajuda (Jardim das Damas', $tag->getName());
$this->assertSame($tag->getName(), $this->tagManager->getTag($tag->getName(), true, true)->getName());
}

public function testUpdateOverlongName(): void {
$tag = $this->tagManager->createTag('initial', true, true);

$this->tagManager->updateTag(
$tag->getId(),
'Zona circundante do Palácio Nacional da Ajuda (Jardim das Damas, Salão de Física, Torre Sineira, Paço Velho e Jardim Botânico)',
true,
true,
null,
);

$this->assertSame('Zona circundante do Palácio Nacional da Ajuda (Jardim das Damas', $this->tagManager->getTag(
'Zona circundante do Palácio Nacional da Ajuda (Jardim das Damas',
true,
true,
)->getName());
}

#[\PHPUnit\Framework\Attributes\DataProvider('oneTagMultipleFlagsProvider')]
Expand Down