From 769da564e296d9589522b9578f8974fcc7c385c5 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 10 Oct 2017 19:22:24 -0700 Subject: re-order the navbar preferences - 1. profile_uid, 2. local_channel, 3, site, 4 'default' --- boot.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 367fe7709..2819b8d75 100755 --- a/boot.php +++ b/boot.php @@ -2090,9 +2090,11 @@ function construct_page() { $installing = false; + $uid = ((App::$profile_uid) ? App::$profile_uid : local_channel()); + $navbar = get_config('system','navbar','default'); - if(App::$profile_uid) { - $navbar = get_pconfig(App::$profile_uid,'system','navbar',$navbar); + if($uid) { + $navbar = get_pconfig($uid,'system','navbar',$navbar); } if($comanche && App::$layout['navbar']) { -- cgit v1.2.3