Index: trunk/kernel/parser.php
===================================================================
diff -u -r1380 -r1443
--- trunk/kernel/parser.php (.../parser.php) (revision 1380)
+++ trunk/kernel/parser.php (.../parser.php) (revision 1443)
@@ -3614,7 +3614,7 @@
}
$_C_objCat = new clsCatList();
- $_Where = GetTablePrefix()."Category.ParentId=$_RootCat";
+ $_Where = GetTablePrefix()."Category.ParentId=$_RootCat AND Status=1";
$_C_catList = $_C_objCat->LoadCategories($_Where, "", false);
## getting TOP level categories
@@ -3638,7 +3638,6 @@
{
foreach ($modules as $curr => $v)
{
-// echo "MOD_CAT: $curr PATH: $sub_path TEMPL: $v
";
if (strpos($sub_path, "|$curr|") !== false)
{
$add_path = $v;
@@ -3648,7 +3647,6 @@
}
$main_templ = $add_path.$MainItemTemplate;
-// echo "TEMPL: $main_templ
";
$ret.= $cat->ParseTemplate($main_templ);
$count++;
@@ -3661,13 +3659,12 @@
else
$ParentPath = "|$_RootCat|$val|%";
- $_Where = GetTablePrefix()."Category.ParentPath LIKE '$ParentPath' AND ".GetTablePrefix()."Category.CategoryId!=$val";
+ $_Where = GetTablePrefix()."Category.ParentPath LIKE '$ParentPath' AND ".GetTablePrefix()."Category.CategoryId!=$val AND Status=1";
$_OrderBy = " ORDER BY ".GetTablePrefix()."Category.ParentPath ASC, ".GetTablePrefix()."Category.Name ASC";
$SubCats = $_C_objCatSubs->LoadCategories($_Where, $_OrderBy);
if (is_array($SubCats) && count($SubCats))
{
-// echo "COUNT: ".count($SubCats);
foreach ($SubCats as $subcat)
{
$SubCatName = $subcat->Get("Name");
@@ -3680,7 +3677,6 @@
{
foreach ($modules as $curr => $v)
{
-// echo "MOD_CAT: $curr PATH: $SubPath TEMPL: $v
";
if (strpos($SubPath, "|$curr|") !== false)
{
$add_path = $v;
@@ -3699,12 +3695,10 @@
$nbs.= " ";
$sub_templ = $add_path.$SubCatItemTemplate;
- // echo "TEMPL: $sub_templ
";
$ret.= $nbs.$subcat->ParseTemplate($sub_templ);
}
}
- }
-
+ }
unset($_C_objCatSubs);
@@ -3719,8 +3713,7 @@
if($count != $per_row)
$ret .= "";
- $ret.= "\n\n";
-
+ $ret.= "\n\n";
}
return $ret;