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

MINOR: Fixed notice-level error

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@84148 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2009-08-11 04:46:47 +00:00
parent 5f6bee22ba
commit bdccbdfbcf
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/model/SiteTree.php
View File

@ -881,6 +881,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
// Default result: nothing editable // Default result: nothing editable
$result = array_fill_keys($ids, false); $result = array_fill_keys($ids, false);
if($ids) { if($ids) {
// Look in the cache for values // Look in the cache for values
@ -982,6 +983,8 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
// Look in the cache for values // Look in the cache for values
if($useCached && isset(self::$cache_permissions['delete'])) { if($useCached && isset(self::$cache_permissions['delete'])) {
$result = array_fill_keys($ids, false);
$cachedValues = array_intersect_key(self::$cache_permissions['delete'], $result); $cachedValues = array_intersect_key(self::$cache_permissions['delete'], $result);
// If we can't find everything in the cache, then look up the remainder separately // If we can't find everything in the cache, then look up the remainder separately