From 03125b8c6cd0f2deb757d856807b050566adeb89 Mon Sep 17 00:00:00 2001 From: Simon Erkelens Date: Fri, 9 Jun 2017 16:48:30 +1200 Subject: [PATCH] API Changes for Authenticator refactor --- code/Report.php | 3 ++- code/ReportAdmin.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/Report.php b/code/Report.php index 0c7b2e52..9e29b763 100644 --- a/code/Report.php +++ b/code/Report.php @@ -21,6 +21,7 @@ use SilverStripe\Forms\GridField\GridFieldDataColumns; use SilverStripe\Forms\GridField\GridFieldPaginator; use SilverStripe\Forms\GridField\GridField; use SilverStripe\Core\Convert; +use SilverStripe\Security\Security; use SilverStripe\View\ViewableData; use ReflectionClass; use SilverStripe\ORM\CMSPreviewable ; @@ -399,7 +400,7 @@ class Report extends ViewableData public function canView($member = null) { if (!$member && $member !== false) { - $member = Member::currentUser(); + $member = Security::getCurrentUser(); } $extended = $this->extendedCan('canView', $member); diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php index deed8e6e..c7024cfd 100644 --- a/code/ReportAdmin.php +++ b/code/ReportAdmin.php @@ -17,6 +17,7 @@ use SilverStripe\ORM\ArrayList; use SilverStripe\ORM\SS_List; use SilverStripe\Security\Member; use SilverStripe\Security\PermissionProvider; +use SilverStripe\Security\Security; use SilverStripe\View\ArrayData; use SilverStripe\View\Requirements; @@ -80,7 +81,7 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider public function canView($member = null) { if (!$member && $member !== false) { - $member = Member::currentUser(); + $member = Security::getCurrentUser(); } if (!parent::canView($member)) {