Merge branch 'dev' into 'dev'

Dev sync

See merge request kostikov/core!1

1 files changed, 3 insertions, 2 deletions

diff --git a/boot.php b/boot.php
index 520cf464a..ec79b3dce 100644
--- a/boot.php
+++ b/boot.php
@@ -2316,13 +2316,14 @@ function construct_page() {
 		$navbar = get_pconfig($uid,'system','navbar',$navbar);
 	}
 
-	if($comanche && App::$layout['navbar']) {
+	if($comanche && isset(App::$layout['navbar'])) {
 		$navbar = App::$layout['navbar'];
 	}
 
 	if (App::$module == 'setup') {
 		$installing = true;
-	} else {
+	}
+	else {
 		nav($navbar);
 	}