From 9b7b718b43e4e368748a4282fbd7ebaf07205a3e Mon Sep 17 00:00:00 2001 From: Jeroen De Meerleer Date: Wed, 10 Jul 2019 16:51:18 +0200 Subject: [PATCH 1/2] Using global $nav_bg if undefined --- view/theme/frio/php/default.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php index b297fcb481..231e92a242 100644 --- a/view/theme/frio/php/default.php +++ b/view/theme/frio/php/default.php @@ -53,6 +53,10 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser"; $nav_bg = PConfig::get($uid, 'frio', 'nav_bg'); } + if (empty($nav_bg)) { + $nav_bg = Config::get('frio', 'nav_bg'); + } + if (empty($nav_bg) || !is_string($nav_bg)) { $nav_bg = "#708fa0"; } From 4ccc8b87b5a9830230009ea8296a49bcf5a5c4e5 Mon Sep 17 00:00:00 2001 From: Jeroen De Meerleer Date: Wed, 10 Jul 2019 16:54:31 +0200 Subject: [PATCH 2/2] Code style --- view/theme/frio/php/default.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php index 231e92a242..22bb995804 100644 --- a/view/theme/frio/php/default.php +++ b/view/theme/frio/php/default.php @@ -54,7 +54,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser"; } if (empty($nav_bg)) { - $nav_bg = Config::get('frio', 'nav_bg'); + $nav_bg = Config::get('frio', 'nav_bg'); } if (empty($nav_bg) || !is_string($nav_bg)) { @@ -83,7 +83,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser"; // special minimal style for modal dialogs if ($minimal) { ?> - +