aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-10-10 19:22:24 -0700
committerzotlabs <mike@macgirvin.com>2017-10-10 19:22:24 -0700
commit769da564e296d9589522b9578f8974fcc7c385c5 (patch)
tree387dfced69802220e7b8913fcaa547278be1b369 /boot.php
parent09b4660c7d8d15cf2419202116199a725c7c109c (diff)
downloadvolse-hubzilla-769da564e296d9589522b9578f8974fcc7c385c5.tar.gz
volse-hubzilla-769da564e296d9589522b9578f8974fcc7c385c5.tar.bz2
volse-hubzilla-769da564e296d9589522b9578f8974fcc7c385c5.zip
re-order the navbar preferences - 1. profile_uid, 2. local_channel, 3, site, 4 'default'
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php6
1 files changed, 4 insertions, 2 deletions
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']) {