Skip to content

Commit 2b3321e

Browse files
committed
fix: corrected fatal error on basic permissions when viewing news
1 parent 437ed1a commit 2b3321e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

phpmyfaq/src/phpMyFAQ/Permission/BasicPermission.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
use phpMyFAQ\Configuration;
2121
use phpMyFAQ\Core\Exception;
2222
use phpMyFAQ\Database;
23+
use phpMyFAQ\Enums\PermissionType;
2324
use phpMyFAQ\User\CurrentUser;
2425

2526
/**
@@ -131,8 +132,8 @@ public function hasPermission(int $userId, mixed $right): bool
131132
return true;
132133
}
133134

134-
if (!is_numeric($right) && is_string($right)) {
135-
$right = $this->getRightId($right);
135+
if ($right instanceof PermissionType) {
136+
$right = $this->getRightId($right->value);
136137
}
137138

138139
return $this->checkUserRight($currentUser->getUserId(), $right);

tests/phpMyFAQ/Permission/BasicPermissionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function testHasPermission(): void
5454
{
5555
$this->assertTrue($this->basicPermission->hasPermission(1, 1));
5656
$this->assertFalse($this->basicPermission->hasPermission(-1, 1));
57-
$this->assertFalse($this->basicPermission->hasPermission(-1, PermissionType::USER_ADD->value));
57+
$this->assertFalse($this->basicPermission->hasPermission(-1, PermissionType::USER_ADD));
5858
}
5959

6060
public function testGetRightId(): void

0 commit comments

Comments
 (0)