--- index.php	2001/10/10 12:00:18	1.11
+++ index.php	2001/11/08 08:55:38	1.16
@@ -12,25 +12,24 @@
 $main_file=$section;
 
 require("inc/section.php");
-
 include("common.inc");
-
 include("find_html_file.inc");
+include("fix_msshit.inc");
+
+if ($menu_item) {
+	$title.=" : $menu_item";
+	$smarty->assign("mtext",$menu_item);
+} else {
+	$smarty->assign("mtext",$title);
+}
 
 if (isset($h) && file_exists(find_html_file("h/$section",$h))) {
 	$main=join('',file(find_html_file("h/$section",$h)));
-	if ($menu_item) {
-		$title.=" : $menu_item";
-	}
+	$main=fix_msshit($main);
 } elseif (isset($p) && file_exists("sections/$p.inc")) {
 	include("sections/$p.inc");
 } elseif (file_exists("template/$main_file.tpl")) {
 	$main=$smarty->fetch("$main_file.tpl");
-} elseif (find_html_file("h",$section)) {
-	$main=join('',file(find_html_file("h",$section)));
-	if (file_exists("sections/$section.inc")) {
-		include("sections/$section.inc");
-	}
 } elseif (isset($static)) {
 	if (strstr($static,",")) {
 		$d=explode(",",$static);	// dir,file
@@ -40,11 +39,17 @@
 	if (find_html_file("static/$d[0]",$d[1])) {
 		$main=join('',file(find_html_file("static/$d[0]",$d[1])));
 		// fix entities from MS programs
-		include("fix_msshit.inc");
 		$main=fix_msshit($main);
 	} else {
 		$main="<b>Can't find static/$d[0]/$d[1]</b>";
 	}
+	if (file_exists("sections/$section.inc")) include("sections/$section.inc");
+} elseif (find_html_file("h",$section)) {
+	$main=join('',file(find_html_file("h",$section)));
+	$main=fix_msshit($main);
+	if (file_exists("sections/$section.inc")) {
+		include("sections/$section.inc");
+	}
 } elseif (file_exists("sections/$section.inc")) {
 	include("sections/$section.inc");
 } else {