tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-29 20:59:23 +02:00
Code Issues Projects Releases Wiki Activity

FIX PHP 5.3 compat for referencing $this in closure, and make method public for same reason

Browse Source 
sdf
This commit is contained in:
Robbie Averill 2018-05-29 14:16:10 +12:00 committed by Daniel Hensby
parent df4648a308
commit 1cbf27e0f4
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/Member.php
View File

@ -1052,7 +1052,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
* *
* @return int[] List of group IDs * @return int[] List of group IDs
*/ */
protected function disallowedGroups() { public function disallowedGroups() {
// unless the current user is an admin already OR the logged in user is an admin // unless the current user is an admin already OR the logged in user is an admin
if (Permission::check('ADMIN') || Permission::checkMember($this, 'ADMIN')) { if (Permission::check('ADMIN') || Permission::checkMember($this, 'ADMIN')) {
return array(); return array();
@ -1476,7 +1476,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
if(Permission::check('EDIT_PERMISSIONS')) { if(Permission::check('EDIT_PERMISSIONS')) {
// Filter allowed groups // Filter allowed groups
$groups = Group::get(); $groups = Group::get();
$disallowedGroupIDs = $this->disallowedGroups(); $disallowedGroupIDs = $self->disallowedGroups();
if ($disallowedGroupIDs) { if ($disallowedGroupIDs) {
$groups = $groups->exclude('ID', $disallowedGroupIDs); $groups = $groups->exclude('ID', $disallowedGroupIDs);
} }