From 900074d11797c0387249796d4d5cbbbe4c372445 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 11 Apr 2019 05:27:26 -0400 Subject: [PATCH] Move App->checkBackend after module determination - Update App->checkBackend to remove dependency to App properties --- src/App.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/App.php b/src/App.php index 21675b9dc3..316982dd28 100644 --- a/src/App.php +++ b/src/App.php @@ -248,7 +248,6 @@ class App $this->profiler = $profiler; $this->logger = $logger; - $this->checkBackend($isBackend); $this->checkFriendicaApp(); $this->profiler->reset(); @@ -318,6 +317,8 @@ class App $this->module = 'home'; } + $this->isBackend = $isBackend || $this->checkBackend($this->module); + // Detect mobile devices $mobile_detect = new MobileDetect(); @@ -623,10 +624,10 @@ class App * This isn't a perfect solution. But we need this check very early. * So we cannot wait until the modules are loaded. * - * @param string $backend true, if the backend flag was set during App initialization - * + * @param string $module + * @return bool */ - private function checkBackend($backend) { + private function checkBackend($module) { static $backends = [ '_well_known', 'api', @@ -651,7 +652,7 @@ class App ]; // Check if current module is in backend or backend flag is set - $this->isBackend = (in_array($this->module, $backends) || $backend || $this->isBackend); + return in_array($module, $backends); } /**