From ee38c72f04ce3bf921efe551c5dfaf77cdb9ac64 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Sat, 29 Aug 2015 20:12:55 +1000 Subject: [PATCH] Protected properties were once [incorrectly] available --- modules/backend/behaviors/ImportExportController.php | 3 ++- modules/system/behaviors/SettingsModel.php | 6 +++--- modules/system/reportwidgets/Status.php | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/backend/behaviors/ImportExportController.php b/modules/backend/behaviors/ImportExportController.php index a78a1707f..1663fadf0 100644 --- a/modules/backend/behaviors/ImportExportController.php +++ b/modules/backend/behaviors/ImportExportController.php @@ -5,6 +5,7 @@ use Lang; use View; use Response; use Backend; +use BackendAuth; use Backend\Classes\ControllerBehavior; use League\Csv\Reader as CsvReader; use League\Csv\Writer as CsvWriter; @@ -620,7 +621,7 @@ class ImportExportController extends ControllerBehavior { if ( ($permissions = $this->getConfig($type.'[permissions]')) && - (!$this->controller->user->hasAnyAccess((array) $permissions)) + (!BackendAuth::getUser()->hasAnyAccess((array) $permissions)) ) { return Response::make(View::make('backend::access_denied'), 403); } diff --git a/modules/system/behaviors/SettingsModel.php b/modules/system/behaviors/SettingsModel.php index 66f16be11..ac66811fe 100644 --- a/modules/system/behaviors/SettingsModel.php +++ b/modules/system/behaviors/SettingsModel.php @@ -39,9 +39,9 @@ class SettingsModel extends ModelBehavior { parent::__construct($model); - $this->model->table = 'system_settings'; - $this->model->jsonable = ['value']; - $this->model->guarded = []; + $this->model->setTable('system_settings'); + $this->model->jsonable(['value']); + $this->model->guard([]); $this->model->timestamps = false; // Option A: (@todo Determine which is faster by benchmark) diff --git a/modules/system/reportwidgets/Status.php b/modules/system/reportwidgets/Status.php index be05f9e99..294bed4da 100644 --- a/modules/system/reportwidgets/Status.php +++ b/modules/system/reportwidgets/Status.php @@ -1,5 +1,6 @@ vars['inMaintenance'] = MaintenanceSettings::get('is_enabled'); - $this->vars['showUpdates'] = $this->controller->user->hasAccess('system.manage_updates'); + $this->vars['showUpdates'] = BackendAuth::getUser()->hasAccess('system.manage_updates'); $this->vars['updates'] = $manager->check(); } }