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

Merged r67152 from trunk

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67194 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Andrew O'Neil 2008-12-02 20:59:02 +00:00 committed by Sam Minnee
parent f746f0d74d
commit 2132e8e301
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/model/SiteTree.php
View File

@ -523,7 +523,7 @@ class SiteTree extends DataObject {
* @todo Check we get a endless recursion if we use parent::can()
*/
function can($perm, $member = null) {
if(!$member) $member = Member::currentUser();
if(!$member && $member !== FALSE) $member = Member::currentUser();
if(Permission::checkMember($member, "ADMIN")) return true;
@ -560,8 +560,8 @@ class SiteTree extends DataObject {
* @return boolean True if the current user can add children.
*/
public function canAddChildren($member = null) {
if(!$member) $member = Member::currentUser();
if(!$member && $member !== FALSE) $member = Member::currentUser();
if(Permission::checkMember($member, "ADMIN")) return true;
// DEPRECATED 2.3: use canAddChildren() instead
@ -592,7 +592,7 @@ class SiteTree extends DataObject {
* @return boolean True if the current user can view this page.
*/
public function canView($member = null) {
if(!$member) $member = Member::currentUser();
if(!$member && $member !== FALSE) $member = Member::currentUser();
// admin override
if(Permission::checkMember($member, "ADMIN")) return true;
@ -647,7 +647,7 @@ class SiteTree extends DataObject {
* @return boolean True if the current user can delete this page.
*/
public function canDelete($member = null) {
if(!$member) $member = Member::currentUser();
if(!$member && $member !== FALSE) $member = Member::currentUser();
if(Permission::checkMember($member, "ADMIN")) return true;