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

ENHANCEMENT: Changed canEdit and canCreate extend to extendedCan

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@115416 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Carlos Barberis 2011-01-11 04:40:04 +00:00 committed by Sam Minnee
parent cc12a7baf0
commit 014087f0f7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
filesystem/File.php
View File

@ -249,8 +249,8 @@ class File extends DataObject {
function canEdit($member = null) { function canEdit($member = null) {
if(!$member) $member = Member::currentUser(); if(!$member) $member = Member::currentUser();
$results = $this->extend('canEdit', $member); $result = $this->extendedCan('canEdit', $member);
if($results && is_array($results)) if(!min($results)) return false; if($result !== null) return $result;
return Permission::checkMember($member, 'CMS_ACCESS_AssetAdmin'); return Permission::checkMember($member, 'CMS_ACCESS_AssetAdmin');
} }
@ -261,8 +261,8 @@ class File extends DataObject {
function canCreate($member = null) { function canCreate($member = null) {
if(!$member) $member = Member::currentUser(); if(!$member) $member = Member::currentUser();
$results = $this->extend('canCreate', $member); $result = $this->extendedCan('canCreate', $member);
if($results && is_array($results)) if(!min($results)) return false; if($result !== null) return $result;
return $this->canEdit($member); return $this->canEdit($member);
} }