diff --git a/core/menu/menu_item_list.php b/core/menu/menu_item_list.php
index 9e854ed4e9..1b3a596e89 100644
--- a/core/menu/menu_item_list.php
+++ b/core/menu/menu_item_list.php
@@ -103,6 +103,7 @@
$menu_item_order = $row2['menu_item_order'];
$menu_item_title = $row2['menu_item_title'];
$menu_item_link = $row2['menu_item_link'];
+ $menu_item_icon = $row2['menu_item_icon'];
//get the groups that have been assigned to the menu
$sql = "select ";
@@ -147,6 +148,9 @@
break;
}
+ //format icon
+ $menu_item_icon = !empty($menu_item_icon) ? "" : null;
+
//display the content of the list
if (permission_exists('menu_item_edit')) {
$list_row_url = 'menu_item_edit.php?id='.urlencode($menu_uuid)."&menu_item_uuid=".urlencode($menu_item_uuid)."&menu_item_parent_uuid=".urlencode($row2['menu_item_parent_uuid']);
@@ -160,10 +164,10 @@
}
echo "
\n";
echo "".$menu_item_link." | \n";
@@ -286,6 +290,7 @@
$menu_item_category = $row['menu_item_category'];
$menu_item_title = $row['menu_item_title'];
$menu_item_link = $row['menu_item_link'];
+ $menu_item_icon = $row['menu_item_icon'];
$menu_item_protected = $row['menu_item_protected'];
//get the groups that have been assigned to the menu
@@ -330,6 +335,9 @@
break;
}
+ //format icon
+ $menu_item_icon = !empty($menu_item_icon) ? "" : null;
+
//display the content of the list
if (permission_exists('menu_item_edit')) {
$list_row_url = 'menu_item_edit.php?id='.urlencode($menu_uuid)."&menu_item_uuid=".urlencode($menu_item_uuid)."&menu_uuid=".urlencode($menu_uuid);
@@ -343,10 +351,10 @@
}
echo "\n";
if (permission_exists('menu_item_edit')) {
- echo " ".escape($menu_item_title)."\n";
+ echo " ".escape($menu_item_title)."".$menu_item_icon."\n";
}
else {
- echo " ".escape($menu_item_title);
+ echo " ".escape($menu_item_title).$menu_item_icon;
}
echo " | \n";
echo "".$menu_item_link." | \n";