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

BUGFIX Returning a boolean instead of Permission IDs in specific SiteTree->canEdit() case

Browse Source 
BUGFIX Passing through $member param from SiteTree->canPublish() to SiteTree->canEdit()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66740 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2008-11-26 04:04:13 +00:00 committed by Sam Minnee
parent 61c58014c1
commit 322fa2a547
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/model/SiteTree.php
View File

@ -726,7 +726,7 @@ class SiteTree extends DataObject {
*/
public function canEdit($member = null) {
if(!$member && $member !== FALSE) $member = Member::currentUser();
if(Permission::checkMember($member, "ADMIN")) return true;
// DEPRECATED 2.3: use canEdit() instead
@ -746,7 +746,7 @@ class SiteTree extends DataObject {
// check for inherit
if($this->CanEditType == 'Inherit') {
if($this->ParentID) return $this->Parent()->canEdit($member);
else return Permission::checkMember($member, 'CMS_ACCESS_CMSMain');
else return (bool)Permission::checkMember($member, 'CMS_ACCESS_CMSMain');
}
// check for any logged-in users
@ -787,7 +787,7 @@ class SiteTree extends DataObject {
if($results && is_array($results)) if(!min($results)) return false;
// Normal case
return $this->canEdit();
return $this->canEdit($member);
}
/**