From 8174bfeb2be2c7b72be409a0a548eec85820bec6 Mon Sep 17 00:00:00 2001 From: rabuzarus Date: Fri, 25 May 2018 08:44:01 +0200 Subject: [PATCH 1/3] Bugfix: compute the current theme each time we want to know which theme is beeing used --- src/App.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/App.php b/src/App.php index 655ea84f00..f93ae2b9f8 100644 --- a/src/App.php +++ b/src/App.php @@ -1095,9 +1095,10 @@ class App return ''; } - if (!$this->current_theme) { - $this->computeCurrentTheme(); - } + //// @TODO Compute the current theme only once (this behavior has + /// already been implemented, but it didn' work well - + /// https://github.com/friendica/friendica/issues/5092) + $this->computeCurrentTheme(); return $this->current_theme; } From f01362538280186a3c637f77a99ddc1a89e4f25f Mon Sep 17 00:00:00 2001 From: rabuzarus Date: Fri, 25 May 2018 08:52:03 +0200 Subject: [PATCH 2/3] fix typo in comment --- src/App.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.php b/src/App.php index f93ae2b9f8..7510a5812e 100644 --- a/src/App.php +++ b/src/App.php @@ -1096,7 +1096,7 @@ class App } //// @TODO Compute the current theme only once (this behavior has - /// already been implemented, but it didn' work well - + /// already been implemented, but it didn't work well - /// https://github.com/friendica/friendica/issues/5092) $this->computeCurrentTheme(); From c66d1f01a37e1adf9ad27c98dde16184474d25a5 Mon Sep 17 00:00:00 2001 From: rabuzarus Date: Fri, 25 May 2018 09:05:16 +0200 Subject: [PATCH 3/3] add missing database use statements --- src/App.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/App.php b/src/App.php index 7510a5812e..dd3d2397cb 100644 --- a/src/App.php +++ b/src/App.php @@ -9,6 +9,8 @@ use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Core\System; +use Friendica\Database\DBM; +use dba; use Detection\MobileDetect;