From e748b1f00f817496ee427255775dc90c2fb5749f Mon Sep 17 00:00:00 2001 From: Thorsten Rinne Date: Wed, 2 Apr 2025 18:03:12 +0200 Subject: [PATCH] fix: corrected runtime issue for empty permission strings, closes #3423 --- phpmyfaq/assets/templates/admin/user/group.twig | 2 +- phpmyfaq/assets/templates/admin/user/users.twig | 2 +- .../Template/Extensions/PermissionTranslationTwigExtension.php | 3 +-- .../Extensions/PermissionTranslationTwigExtensionTest.php | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/phpmyfaq/assets/templates/admin/user/group.twig b/phpmyfaq/assets/templates/admin/user/group.twig index f11dfcf576..ebff08781c 100644 --- a/phpmyfaq/assets/templates/admin/user/group.twig +++ b/phpmyfaq/assets/templates/admin/user/group.twig @@ -252,7 +252,7 @@ name="group_rights[]" value="{{ right.right_id }}" class="form-check-input permission" disabled> {% endfor %} diff --git a/phpmyfaq/assets/templates/admin/user/users.twig b/phpmyfaq/assets/templates/admin/user/users.twig index f81f8938e2..cf19b5a8c2 100644 --- a/phpmyfaq/assets/templates/admin/user/users.twig +++ b/phpmyfaq/assets/templates/admin/user/users.twig @@ -176,7 +176,7 @@ name="user_rights[]" value="{{ right.right_id }}" class="form-check-input permission" /> {% endfor %} diff --git a/phpmyfaq/src/phpMyFAQ/Template/Extensions/PermissionTranslationTwigExtension.php b/phpmyfaq/src/phpMyFAQ/Template/Extensions/PermissionTranslationTwigExtension.php index 5a2c795186..76f5d00a2b 100644 --- a/phpmyfaq/src/phpMyFAQ/Template/Extensions/PermissionTranslationTwigExtension.php +++ b/phpmyfaq/src/phpMyFAQ/Template/Extensions/PermissionTranslationTwigExtension.php @@ -32,7 +32,6 @@ public function getFilters(): array private function getPermissionTranslation(string $string): string { - $translationCode = sprintf('permission::%s', $string); - return Translation::get($translationCode) ?? ''; + return empty($string) ? '' : (Translation::get(sprintf('permission::%s', $string)) ?? ''); } } diff --git a/tests/phpMyFAQ/Template/Extensions/PermissionTranslationTwigExtensionTest.php b/tests/phpMyFAQ/Template/Extensions/PermissionTranslationTwigExtensionTest.php index 2b33412d42..76c2e2f49e 100644 --- a/tests/phpMyFAQ/Template/Extensions/PermissionTranslationTwigExtensionTest.php +++ b/tests/phpMyFAQ/Template/Extensions/PermissionTranslationTwigExtensionTest.php @@ -14,7 +14,7 @@ protected function setUp(): void $this->extension = new PermissionTranslationTwigExtension(); } - public function testGetFilters() + public function testGetFilters(): void { $filters = $this->extension->getFilters();