mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-16 21:58:17 +01:00
Code Issues Projects Releases Wiki Activity

Enh #6248: If admins can view all contents, users allowed to manage spaces or users cannot view all content (they should be able) (#6263)

Browse Source 
Co-authored-by: Lucas Bartholemy <luke-@users.noreply.github.com>
This commit is contained in:
Marc Farré 2023-04-27 23:07:48 +02:00 committed by GitHub
parent c8f1995e28
commit 0cc4fdd630
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -5,6 +5,7 @@ HumHub Changelog
------------------- -------------------
- Fix #6251: Emulate execution on `readable()` content - Fix #6251: Emulate execution on `readable()` content
- Enh #6252: Implement new method to handle changing of content active record state - Enh #6252: Implement new method to handle changing of content active record state
- Enh #6248: If admins can view all contents, users allowed to manage spaces or users cannot view all content (they should be able)
- Enh #6255: Updated activities to same state as parent record - Enh #6255: Updated activities to same state as parent record
1.14.0 (April 20, 2023) 1.14.0 (April 20, 2023)

4
protected/humhub/modules/user/models/User.php
View File

@ -759,8 +759,8 @@ class User extends ContentContainerActiveRecord implements IdentityInterface, Se
return $module->adminCanViewAllContent && ( return $module->adminCanViewAllContent && (
$this->isSystemAdmin() $this->isSystemAdmin()
|| ($containerClass === Space::class && $this->can(ManageSpaces::class)) || ($containerClass === Space::class && (new PermissionManager(['subject' => $this]))->can(ManageSpaces::class))
|| ($containerClass === static::class && $this->can(ManageUsers::class)) || ($containerClass === static::class && (new PermissionManager(['subject' => $this]))->can(ManageUsers::class))
); );
} }