Skip to content
Snippets Groups Projects
Commit ca5baf93 authored by Matthias Meusburger's avatar Matthias Meusburger
Browse files

rel #18026: Prevent hasLocalPermissionOn from crashing when no permission is given.

parent 0724f622
Branches
Tags
3 merge requests!715Master,!696Dev#20351 articles admin as list,!599Dev#18026 categories permissions handling
......@@ -387,9 +387,10 @@ class Class_UserGroup extends Storm_Model_Abstract {
public function hasLocalPermissionOn($permission, $model) {
return 0 < Class_UserGroup_Permission::countBy(['id_group' => $this->getId(),
'id_permission' => $permission->getId(),
'id_model' => $model->getId()]);
return $permission && $model
&& 0 < Class_UserGroup_Permission::countBy(['id_group' => $this->getId(),
'id_permission' => $permission->getId(),
'id_model' => $model->getId()]);
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment