diff --git a/modules/backend/classes/BackendController.php b/modules/backend/classes/BackendController.php index d72cc491c..5043b069e 100644 --- a/modules/backend/classes/BackendController.php +++ b/modules/backend/classes/BackendController.php @@ -8,10 +8,10 @@ use Event; use Config; use Request; use Response; -use Closure; use Illuminate\Routing\Controller as ControllerBase; use October\Rain\Router\Helper as RouterHelper; use System\Classes\PluginManager; +use Closure; /** * This is the master controller for all back-end pages. @@ -50,13 +50,6 @@ class BackendController extends ControllerBase */ protected $cmsHandling = false; - /** - * Stores the requested controller so that the constructor is only run once - * - * @var Backend\Classes\Controller - */ - protected $requestedController; - /** * Instantiate a new BackendController instance. */ diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php index 7021d5e31..ead8a6c8f 100644 --- a/modules/backend/classes/Controller.php +++ b/modules/backend/classes/Controller.php @@ -152,6 +152,8 @@ class Controller extends Extendable */ $this->user = BackendAuth::getUser(); + parent::__construct(); + /* * Media Manager widget is available on all back-end pages */ diff --git a/modules/backend/controllers/Auth.php b/modules/backend/controllers/Auth.php index b02313c87..1c8c4403f 100644 --- a/modules/backend/controllers/Auth.php +++ b/modules/backend/controllers/Auth.php @@ -40,14 +40,6 @@ class Auth extends Controller // $response->headers->set('Cache-Control', 'no-cache, no-store, must-revalidate'); // })->only('signin'); - // // Only run on HTTPS connections - // if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] === "on") { - // $this->middleware(function ($request, $response) { - // // Add HTTP Header 'Clear Site Data' to remove all Sensitive Data when signout, see github issue: #3707 - // $response->headers->set('Clear-Site-Data', 'cache, cookies, storage, executionContexts'); - // })->only('signout'); - // } - $this->layout = 'auth'; }