Compare commits

...

3 Commits
2 ... 1.4.2

Author SHA1 Message Date
Robbie Averill
cd8b1872f5 Reduce to 3.6 in Travis for SS3 tests 2019-06-25 16:43:24 +12:00
Robbie Averill
f6ee5af968 Remove 3 branch from Travis builds 2019-06-25 16:03:55 +12:00
Robbie Averill
800f09dd0d FIX LeftAndMainSubsites::canAccess() now accepts a Member argument and falls back to the session member 2019-06-25 15:41:13 +12:00
2 changed files with 12 additions and 5 deletions

View File

@ -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.6
- php: 5.4
env: DB=MYSQL CORE_RELEASE=3.6
- php: 7.1

View File

@ -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);
}
/**