Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

1 files changed, 5 insertions, 3 deletions

diff --git a/boot.php b/boot.php
index 3feac5177..2819b8d75 100755
--- a/boot.php
+++ b/boot.php
@@ -2090,9 +2090,11 @@ function construct_page() {
 
 	$installing = false;
 
-	$navbar = get_config('system','navbar','nav');
-	if(App::$profile_uid) {
-		$navbar = get_pconfig(App::$profile_uid,'system','navbar',$navbar);
+	$uid = ((App::$profile_uid) ? App::$profile_uid : local_channel());
+
+	$navbar = get_config('system','navbar','default');
+	if($uid) {
+		$navbar = get_pconfig($uid,'system','navbar',$navbar);
 	}
 	
 	if($comanche && App::$layout['navbar']) {