--- index.php	2001/09/04 09:52:42	1.8
+++ index.php	2001/09/07 12:55:13	1.9
@@ -37,13 +37,13 @@
 		$mnu = "inc/menuKnjiznica.php";
 		$inc = "inc/pgKnjiznica";
 	}
-	if ($section_name) array_push($PATH, MyUpper($section_name));
-	if ($section_menu_name) array_push($PATH, MyUpper($section_menu_name));
 	if ($mnu && file_exists($mnu)) {
 		include_once($mnu);
 		include_once("inc/menu.php");
 		$inc = $inc.($section_menu?"-$section_menu":"").".php";
 	}
+	if ($section_name) array_push($PATH, MyUpper($section_name));
+	if ($section_menu_name) array_push($PATH, MyUpper($section_menu_name));
 	if ($inc && file_exists($inc)) include_once($inc);
 	$tpl->assign("isedit", $isEdit);
 	$tpl->assign("ismed", $isMed);
@@ -51,7 +51,7 @@
 	$tpl->assign("newspicdir", "$picdir/");
 	$tpl->assign("section", $section);
 	$tpl->assign("section_menu", $section_menu);
-	if ($fname) $main = $tpl->fetch($fname);
+	$main = $fname ? $tpl->fetch($fname) : "";
 	$tpl->assign("MAIN", $main);
 	$tpl->assign("onload", $onload);
 	$tpl->display("index.tpl");