diff --git a/.travis.yml b/.travis.yml index 5044003..bc9813c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ matrix: - php: 5.3 env: DB=PGSQL CORE_RELEASE=3.4 - php: 5.6 - env: DB=MYSQL CORE_RELEASE=3 + env: DB=MYSQL CORE_RELEASE=3.7 - php: 5.4 env: DB=MYSQL CORE_RELEASE=3.6 - php: 7.1 diff --git a/code/extensions/LeftAndMainSubsites.php b/code/extensions/LeftAndMainSubsites.php index bd7fb73..c92aef2 100644 --- a/code/extensions/LeftAndMainSubsites.php +++ b/code/extensions/LeftAndMainSubsites.php @@ -183,11 +183,16 @@ class LeftAndMainSubsites extends Extension /** * Check if the current controller is accessible for this user on this subsite. + * + * @param Member $member */ - public function canAccess() + public function canAccess(Member $member = null) { + if (!$member) { + $member = Member::currentUser(); + } + // Admin can access everything, no point in checking. - $member = Member::currentUser(); if ($member && ( Permission::checkMember($member, 'ADMIN') || // 'Full administrative rights' in SecurityAdmin @@ -209,10 +214,12 @@ class LeftAndMainSubsites extends Extension /** * Prevent accessing disallowed resources. This happens after onBeforeInit has executed, * so all redirections should've already taken place. + * + * @param Member $member */ - public function alternateAccessCheck() + public function alternateAccessCheck(Member $member = null) { - return $this->owner->canAccess(); + return $this->owner->canAccess($member); } /**