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

Replace DataObject->isNotNull() helper with closure

Browse Source 
Now possible since we support PHP 5.3+ only.
This commit is contained in:
Ingo Schommer 2013-06-13 07:53:27 +02:00
parent 0650dbe1e7
commit 5a94e621c5
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
model/DataObject.php
View File

@ -2568,7 +2568,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
$results = $this->extend($methodName, $member); $results = $this->extend($methodName, $member);
if($results && is_array($results)) { if($results && is_array($results)) {
// Remove NULLs // Remove NULLs
$results = array_filter($results, array($this,'isNotNull')); $results = array_filter($results, function($v) {return !is_null($v);});
// If there are any non-NULL responses, then return the lowest one of them. // If there are any non-NULL responses, then return the lowest one of them.
// If any explicitly deny the permission, then we don't get access // If any explicitly deny the permission, then we don't get access
if($results) return min($results); if($results) return min($results);
@ -2576,16 +2576,6 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
return null; return null;
} }
/**
* Helper functon for extendedCan
*
* @param Mixed $value
* @return boolean
*/
private function isNotNull($value) {
return !is_null($value);
}
/** /**
* @param Member $member * @param Member $member
* @return boolean * @return boolean