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

291 checks if ->value is iterable

Browse Source
This commit is contained in:
Oly Su 2016-08-31 12:18:45 +12:00 committed by Damian Mooyman
parent 33be3a0c34
commit 4d85da179f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Security/PermissionCheckboxSetField.php
View File

@ -9,6 +9,7 @@ use SilverStripe\ORM\ArrayList;
use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DataObjectInterface; use SilverStripe\ORM\DataObjectInterface;
use SilverStripe\ORM\SS_List; use SilverStripe\ORM\SS_List;
use Traversable;
/** /**
* Shows a categorized list of available permissions (through {@link Permission::get_codes()}). * Shows a categorized list of available permissions (through {@link Permission::get_codes()}).
@ -248,7 +249,7 @@ class PermissionCheckboxSetField extends FormField
Permission::checkMember($record, 'ADMIN') && $code != 'ADMIN') { Permission::checkMember($record, 'ADMIN') && $code != 'ADMIN') {
$icon = 'plus-circled'; $icon = 'plus-circled';
} }
$options .= "<li class=\"$extraClass\">" $options .= "<li class=\"$extraClass\">"
. "<input id=\"$itemID\"$disabled name=\"$this->name[$code]\" type=\"checkbox\"" . "<input id=\"$itemID\"$disabled name=\"$this->name[$code]\" type=\"checkbox\""
. " value=\"$code\"$checked class=\"checkbox\" />" . " value=\"$code\"$checked class=\"checkbox\" />"
@ -298,7 +299,9 @@ class PermissionCheckboxSetField extends FormField
// Remove all "privileged" permissions if the currently logged-in user is not an admin // Remove all "privileged" permissions if the currently logged-in user is not an admin
$privilegedPermissions = Permission::config()->privileged_permissions; $privilegedPermissions = Permission::config()->privileged_permissions;
if (!Permission::check('ADMIN')) { if ((is_array($this->value) || $this->value instanceof Traversable)
&& !Permission::check('ADMIN')
) {
foreach ($this->value as $id => $bool) { foreach ($this->value as $id => $bool) {
if (in_array($id, $privilegedPermissions)) { if (in_array($id, $privilegedPermissions)) {
unset($this->value[$id]); unset($this->value[$id]);
@ -321,7 +324,7 @@ class PermissionCheckboxSetField extends FormField
$record->write(); // We need a record ID to write permissions $record->write(); // We need a record ID to write permissions
} }
if ($this->value) { if (is_array($this->value) || $this->value instanceof Traversable) {
foreach ($this->value as $id => $bool) { foreach ($this->value as $id => $bool) {
if ($bool) { if ($bool) {
$perm = new $managedClass(); $perm = new $managedClass();