Merge pull request #7415 from TiMESPLiNTER/fix/photo-tag-rendering

[friendica.git] / view / theme / frio / config.php

diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php
index c1ac98286ddf3e3384a37cfac2cbefba3e02ab1e..0f3eda4c940a494372cdaf3e8e36878b3e1b2aad 100644 (file)
--- a/view/theme/frio/config.php
+++ b/view/theme/frio/config.php
@@ -30,7 +30,7 @@ function theme_post(App $a)
 
 function theme_admin_post(App $a)
 {
-       if (!local_user()) {
+       if (!is_site_admin()) {
                return;
        }
 
@@ -56,15 +56,17 @@ function theme_content(App $a)
        }
        $arr = [];
 
-       $arr['scheme']           = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'schema'));
-    $arr['share_string']     = '';
-       $arr['nav_bg']           = PConfig::get(local_user(), 'frio', 'nav_bg');
-       $arr['nav_icon_color']   = PConfig::get(local_user(), 'frio', 'nav_icon_color');
-       $arr['link_color']       = PConfig::get(local_user(), 'frio', 'link_color');
-       $arr['background_color'] = PConfig::get(local_user(), 'frio', 'background_color');
-       $arr['contentbg_transp'] = PConfig::get(local_user(), 'frio', 'contentbg_transp');
-       $arr['background_image'] = PConfig::get(local_user(), 'frio', 'background_image');
-       $arr['bg_image_option']  = PConfig::get(local_user(), 'frio', 'bg_image_option');
+       $node_scheme = Config::get('frio', 'scheme', Config::get('frio', 'scheme'));
+
+       $arr['scheme']           = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'schema', $node_scheme));
+       $arr['share_string']     = '';
+       $arr['nav_bg']           = PConfig::get(local_user(), 'frio', 'nav_bg'          , Config::get('frio', 'nav_bg'));
+       $arr['nav_icon_color']   = PConfig::get(local_user(), 'frio', 'nav_icon_color'  , Config::get('frio', 'nav_icon_color'));
+       $arr['link_color']       = PConfig::get(local_user(), 'frio', 'link_color'      , Config::get('frio', 'link_color'));
+       $arr['background_color'] = PConfig::get(local_user(), 'frio', 'background_color', Config::get('frio', 'background_color'));
+       $arr['contentbg_transp'] = PConfig::get(local_user(), 'frio', 'contentbg_transp', Config::get('frio', 'contentbg_transp'));
+       $arr['background_image'] = PConfig::get(local_user(), 'frio', 'background_image', Config::get('frio', 'background_image'));
+       $arr['bg_image_option']  = PConfig::get(local_user(), 'frio', 'bg_image_option' , Config::get('frio', 'bg_image_option'));
 
        return frio_form($arr);
 }
@@ -119,7 +121,6 @@ function frio_form($arr)
        $t = Renderer::getMarkupTemplate('theme_settings.tpl');
        $ctx = [
                '$submit'           => L10n::t('Submit'),
-               '$baseurl'          => System::baseUrl(),
                '$title'            => L10n::t('Theme settings'),
                '$scheme'           => ['frio_scheme', L10n::t('Select color scheme'), $arr['scheme'], '', $scheme_choices],
                '$share_string'     => ['frio_share_string', L10n::t('Copy or paste schemestring'), $arr['share_string'], L10n::t('You can copy this string to share your theme with others. Pasting here applies the schemestring'), false, false],