Merge pull request #6747 from nupplaphil/issue/6677-frio_admin

Fixing frio theme customization for admin

diff --git a/view/theme/frio/php/scheme.php b/view/theme/frio/php/scheme.php
index 2f091804394b3eade1d485a00dfb31b3afb0690a..9e3f610cd558d92f353c4e95a814c530add16700 100644 (file)
--- a/view/theme/frio/php/scheme.php
+++ b/view/theme/frio/php/scheme.php
@@ -17,13 +17,16 @@
  *    'version' => Scheme version
  *    'overwrites' => Variables which overwriting custom settings
  */
+
 use Friendica\Core\PConfig;
 
 function get_scheme_info($scheme)
 {
        $theme = \get_app()->getCurrentTheme();
        $themepath = 'view/theme/' . $theme . '/';
-       $scheme = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'scheme'));
+       if (empty($scheme)) {
+               $scheme = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'scheme'));
+       }
 
        $info = [
                'name' => $scheme,