Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-05-07 08:57:06 +02:00
Code Issues Packages Projects Releases Activity

Fixed some admin related ACL issues

Browse Source
This commit is contained in:
Matias Griese
2020-02-03 12:53:41 +02:00
parent d589dbcbea
commit defc70e656
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
system/src/Grav/Common/Flex/UserGroups/UserGroupCollection.php
View File

@@ -35,6 +35,7 @@ class UserGroupCollection extends FlexCollection
public function authorize(string $action, string $scope = null): ?bool
{
$authorized = null;
/** @var UserGroupObject $object */
foreach ($this as $object) {
$auth = $object->authorize($action, $scope);
if ($auth === true) {

10
system/src/Grav/Common/Twig/TwigExtension.php
View File

@@ -1028,8 +1028,14 @@ class TwigExtension extends AbstractExtension implements GlobalsInterface
*/
public function authorize($action)
{
/** @var UserInterface|null $user */
$user = $this->grav['user'] ?? null;
// Admin can use Flex users even if the site does not; make sure we use the right version of the user.
$admin = $this->grav['admin'] ?? null;
if ($admin) {
$user = $admin->user;
} else {
/** @var UserInterface|null $user */
$user = $this->grav['user'] ?? null;
}
if (!$user) {
return false;