From 846f8becae02aad9d3b544f9bfd38fc336e86650 Mon Sep 17 00:00:00 2001 From: Andreas Neustifter Date: Fri, 27 Apr 2018 20:45:34 +0200 Subject: [PATCH] Install selected theme during settings persistence. Themes have to be installed to be usable by the system. This is not done automatically which lead to the problems with the site when themes where switched right after the install and before the "Reload themes" button was pressed in the admin page. This patch makes sure that the selected them is always installed when it is selected by the user either in the admin or settings page. Fixes #4921. --- mod/admin.php | 1 + mod/settings.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/mod/admin.php b/mod/admin.php index 7749cff6dc..3090376bea 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1120,6 +1120,7 @@ function admin_page_site_post(App $a) } Config::set('system', 'language', $language); Config::set('system', 'theme', $theme); + Theme::install($theme); if ($theme_mobile == '---') { Config::delete('system', 'mobile-theme'); diff --git a/mod/settings.php b/mod/settings.php index aec2b2a050..3102fef233 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -12,6 +12,7 @@ use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Core\System; +use Friendica\Core\Theme; use Friendica\Core\Worker; use Friendica\Database\DBM; use Friendica\Model\Contact; @@ -354,6 +355,7 @@ function settings_post(App $a) theme_post($a); } } + Theme::install($theme); $r = q("UPDATE `user` SET `theme` = '%s' WHERE `uid` = %d", dbesc($theme),