tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-10-22 09:05:55 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX More solid checks in Subsite permission methods to deal with non-existing members

Browse Source
This commit is contained in:
Ingo Schommer 2008-12-03 22:31:54 +00:00
parent d373b09908
commit 83fb26cc3e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/Subsite.php
View File

@ -343,7 +343,9 @@ JS;
* @return DataObjectSet Subsite instances
*/
static function getSubsitesForMember( $member = null) {
if(!$member) $member = Member::currentMember();
if(!$member && $member !== FALSE) $member = Member::currentMember();
if(!$member) return false;
if(self::hasMainSitePermission($member)) {
return DataObject::get('Subsite');
@ -363,7 +365,9 @@ JS;
if(!is_array($permissionCodes))
user_error('Permissions must be passed to Subsite::hasMainSitePermission as an array', E_USER_ERROR);
if(!$member) $member = Member::currentMember();
if(!$member && $member !== FALSE) $member = Member::currentMember();
if(!$member) return false;
if(Permission::checkMember($member->ID, "ADMIN")) return true;