tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

FIX readonly PermissionCheckboxSetField

Browse Source 
A readonly PermissionCheckboxSetField (eg in Security when viewing a member without permission to edit it) can result in calling "getRecord()" on null.  Add is_object check, consistent with line 98.
This commit is contained in:
Mike Cochrane 2017-09-25 15:25:10 +13:00 committed by GitHub
parent 5164f003d9
commit b8e5a2ce32
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Security/PermissionCheckboxSetField.php
View File

@ -242,7 +242,7 @@ class PermissionCheckboxSetField extends FormField
// If the field is readonly, add a span that will replace the disabled checkbox input
if ($this->readonly) {
$icon = ($checked) ? 'check-mark-circle' : 'cancel-circled';
$record = $this->form->getRecord();
$record = is_object($this->form) ? $this->form->getRecord() : false;
// Inherited codes are shown as a gray x
if ($record && $record instanceof Member &&
Permission::checkMember($record, 'ADMIN') && $code != 'ADMIN') {