X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=6fa79c50144190638e8de86c1a1542dc5be8c0bb;hb=341d8860d15cd2224a3595dfa3c553b03658ef60;hp=9cbac155b583df11b35b923669ef7c9f0f284db0;hpb=7218d6e1718a2ee50ff32ef07868db47113f2598;p=friendica.git diff --git a/src/App.php b/src/App.php index 9cbac155b5..6fa79c5014 100644 --- a/src/App.php +++ b/src/App.php @@ -1,6 +1,6 @@ database->selectFirst('user', ['theme'], ['uid' => $this->profile_owner]); - if ($this->database->isResult($user) && !$this->pConfig->get(local_user(), 'system', 'always_my_theme')) { + if ($this->database->isResult($user) && !local_user()) { $page_theme = $user['theme']; } } @@ -504,7 +504,7 @@ class App if (!empty($this->profile_owner) && ($this->profile_owner != local_user())) { // Allow folks to override user themes and always use their own on their own site. // This works only if the user is on the same server - if (!$this->pConfig->get(local_user(), 'system', 'always_my_theme')) { + if (!local_user()) { $page_mobile_theme = $this->pConfig->get($this->profile_owner, 'system', 'mobile-theme'); } } @@ -576,11 +576,12 @@ class App $this->profiler->set(microtime(true), 'classinit'); $moduleName = $this->args->getModuleName(); + $page->setLogging($this->args->getCommand(), $this->args->getMethod()); try { // Missing DB connection: ERROR if ($this->mode->has(App\Mode::LOCALCONFIGPRESENT) && !$this->mode->has(App\Mode::DBAVAILABLE)) { - throw new HTTPException\InternalServerErrorException('Apologies but the website is unavailable at the moment.'); + throw new HTTPException\InternalServerErrorException($this->l10n->t('Apologies but the website is unavailable at the moment.')); } if (!$this->mode->isInstall()) { @@ -718,6 +719,7 @@ class App } catch (HTTPException $e) { (new ModuleHTTPException())->rawContent($e); } + $page->logRuntime($this->config, 'runFrontend'); } /**