From c7a3354dfd5fcad9a435dae0f15db4ace80de4ef Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Tue, 31 Oct 2017 08:45:11 -0600 Subject: [PATCH] Move backend.page.beforeDisplay after auth check Fixes #3215. Related: https://github.com/octobercms/october/commit/47cd204686718c9388ec8be7c4fef7a5a3623edc#diff-6cdbb280344f40eebe758cf8e8e5f7d9 --- modules/backend/classes/Controller.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php index 450d19d35..cabaefd3d 100644 --- a/modules/backend/classes/Controller.php +++ b/modules/backend/classes/Controller.php @@ -183,13 +183,6 @@ class Controller extends Extendable return Redirect::secure(Request::path()); } - /* - * Extensibility - */ - if ($event = $this->fireSystemEvent('backend.page.beforeDisplay', [$action, $params])) { - return $event; - } - /* * Determine if this request is a public action. */ @@ -216,6 +209,13 @@ class Controller extends Extendable return Response::make(View::make('backend::access_denied'), 403); } } + + /* + * Extensibility + */ + if ($event = $this->fireSystemEvent('backend.page.beforeDisplay', [$action, $params])) { + return $event; + } /* * Set the admin preference locale