Merge pull request #7540 from vinzv/patch-1

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

diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php
index ce7fd4d777ef39539aee13839b1041a79348fcac..22bb995804a474cd032d74f1bb479351fdf7577a 100644 (file)
--- a/view/theme/frio/php/default.php
+++ b/view/theme/frio/php/default.php
@@ -42,12 +42,9 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
 
                // Add the theme color meta
                // It makes mobile Chrome UI match Frio's top bar color.
-               $uid = $a->profile_uid;
-               if (is_null($uid)) {
-                       $uid = Profile::getThemeUid();
-               }
+               $uid = Profile::getThemeUid($a);
                $scheme = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema'));
-               if ($scheme && ($scheme != '---')) {
+               if ($scheme && is_string($scheme) && $scheme != '---') {
                        if (file_exists('view/theme/frio/scheme/' . $scheme . '.php')) {
                                $schemefile = 'view/theme/frio/scheme/' . $scheme . '.php';
                                require_once $schemefile;
@@ -57,6 +54,10 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
                }
 
                if (empty($nav_bg)) {
+                       $nav_bg = Config::get('frio', 'nav_bg');
+               }
+
+               if (empty($nav_bg) || !is_string($nav_bg)) {
                        $nav_bg = "#708fa0";
                }
 
@@ -82,7 +83,8 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
        // special minimal style for modal dialogs
        if ($minimal) {
 ?>
-               <section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important; display:block!important;">
+               <!-- <?php echo __FILE__ ?> -->
+               <section class="minimal">
                        <?php if (!empty($page['content'])) echo $page['content']; ?>
                        <div id="page-footer"></div>
                </section>