X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrio%2Fphp%2Fdefault.php;h=22bb995804a474cd032d74f1bb479351fdf7577a;hb=0a82fe4211f73cf10107feb69fe38eaa85eb61f8;hp=24c722e8e3f51347215e696f11c091d82c79b12b;hpb=8821d33f73785884cfce83e7b23d3ef19cc1bc11;p=friendica.git diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php index 24c722e8e3..22bb995804 100644 --- a/view/theme/frio/php/default.php +++ b/view/theme/frio/php/default.php @@ -36,18 +36,15 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser"; // if the page is an standard page (so we don't have it twice for modals) // /// @todo Think about to move js stuff in the footer - if (!$minimal && x($page, 'htmlhead')) { + if (!$minimal && !empty($page['htmlhead'])) { echo $page['htmlhead']; } // 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"; } @@ -67,7 +68,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser"; "> Skip to main content -
- + +
+
'; - if (x($page, 'aside')) { + if (!empty($page['aside'])) { echo $page['aside']; } - if (x($page, 'right_aside')) { + if (!empty($page['right_aside'])) { echo $page['right_aside']; } @@ -113,7 +115,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
'; - if (x($page, 'content')) { + if (!empty($page['content'])) { echo $page['content']; } echo ' @@ -124,7 +126,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser"; } else { echo '
'; - if (x($page, 'content')) { + if (!empty($page['content'])) { echo $page['content']; } echo '