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

BUGFIX: fixed canPublish() so it actually got the member if none was passed and fixed notice with $results not existing

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65242 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Will Rossiter 2008-11-05 01:05:57 +00:00
parent 5f177b9f08
commit bb20921fef
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/model/SiteTree.php
View File

@ -713,7 +713,7 @@ class SiteTree extends DataObject {
public function canEdit($member = null) { public function canEdit($member = null) {
if(Permission::checkMember($member, "ADMIN")) return true; if(Permission::checkMember($member, "ADMIN")) return true;
if(!$member) $member = Member::currentUser(); if(!$member) $member = Member::currentUser();
// decorated access checks // decorated access checks
$args = array($member, true); $args = array($member, true);
$this->extend('alternateCanEdit', $args); $this->extend('alternateCanEdit', $args);
@ -765,8 +765,9 @@ class SiteTree extends DataObject {
public function canPublish($member = null) { public function canPublish($member = null) {
// If we have a result, then that means at least one decorator specified alternateCanPublish // If we have a result, then that means at least one decorator specified alternateCanPublish
// Allow the permission check only if *all* voting decorators allow it. // Allow the permission check only if *all* voting decorators allow it.
if(!$member) $member = Member::currentUser();
$results = $this->extend('alternateCanPublish', $member); $results = $this->extend('alternateCanPublish', $member);
if(is_array($results)) return min($results); if($results && is_array($results)) return min($results);
// Normal case // Normal case
return $this->canEdit(); return $this->canEdit();