Index: branches/5.1.x/core/units/helpers/menu_helper.php
===================================================================
diff -u -N -r13881 -r13951
--- branches/5.1.x/core/units/helpers/menu_helper.php	(.../menu_helper.php)	(revision 13881)
+++ branches/5.1.x/core/units/helpers/menu_helper.php	(.../menu_helper.php)	(revision 13951)
@@ -236,7 +236,7 @@
 				'cat_id' => $page['CategoryId'],
 				'item_type' => $page['ItemType'],
 				'page_id' => $page['ItemId'],
-				'use_section' => (int)$page['IsSystem'] && ($page['ItemPath'] != 'index'),
+				'use_section' => ($page['Type'] == PAGE_TYPE_TEMPLATE) && ($page['ItemPath'] != 'index'),
 				'has_sub_menu' => isset($page['sub_items']) && count($page['sub_items']) > 0,
 				'external_url' => $page['UseExternalUrl'] ? $page['ExternalUrl'] : false, // for backward compatibility
 				'menu_icon' => $page['UseMenuIconUrl'] ? $page['MenuIconUrl'] : false,
@@ -341,11 +341,11 @@
 							c.Priority AS ItemPriority,
 							' . $lang_part . '
 
-							IF(c.IsSystem, c.Template, CONCAT("id:", c.CategoryId)) AS ItemPath,
+							IF(c.`Type` = ' . PAGE_TYPE_TEMPLATE . ', c.Template, CONCAT("id:", c.CategoryId)) AS ItemPath,
 							c.ParentPath AS ParentPath,
 							c.ParentId As ParentId,
 							\'cat\' AS ItemType,
-							c.IsMenu, c.IsSystem, c.ThemeId, c.UseExternalUrl, c.ExternalUrl, c.UseMenuIconUrl, c.MenuIconUrl
+							c.IsMenu, c.Type, c.ThemeId, c.UseExternalUrl, c.ExternalUrl, c.UseMenuIconUrl, c.MenuIconUrl
 						FROM ' . TABLE_PREFIX . 'Category AS c
 						WHERE c.Status = ' . STATUS_ACTIVE;
 				$items = $this->Conn->Query($sql, 'ItemId');