BUGFIX Returning a boolean instead of Permission IDs in specific Site…

…Tree->canEdit() case

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

core/model/SiteTree.php

@@ -726,7 +726,7 @@ public function canCreate($member = null) {
 	 */
 	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 @@ public function canEdit($member = null) {
 		// 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 @@ public function canPublish($member = null) {
 		if($results && is_array($results)) if(!min($results)) return false;
 
 		// Normal case
-		return $this->canEdit();
+		return $this->canEdit($member);
 	}
 
 	/**