diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index 97f0246ac88..1dea0ca4473 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -328,18 +328,18 @@ if ($conf->use_javascript_ajax)
$entry = '
';
- $buttons = ''.img_edit('default', 0, 'class="menuEdit" id="edit'.$menu['rowid'].'"').' ';
- $buttons .= ''.img_edit_add('default').' ';
- $buttons .= ''.img_delete('default').' ';
+ $buttons = ''.img_edit('default', 0, 'class="menuEdit" id="edit'.$menu['rowid'].'"').' ';
+ $buttons .= ''.img_edit_add('default').' ';
+ $buttons .= ''.img_delete('default').' ';
$buttons .= ' ';
- $buttons .= ''.img_picto("Up", "1uparrow").''.img_picto("Down", "1downarrow").'';
+ $buttons .= ''.img_picto("Up", "1uparrow").''.img_picto("Down", "1downarrow").'';
$data[] = array(
'rowid'=>$menu['rowid'],
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index a6d774090aa..953064e6b4c 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -656,7 +656,7 @@ class Menubase
// Define $right
$perms = true;
- if ($menu['perms'])
+ if (isset($menu['perms']))
{
$tmpcond = $menu['perms'];
if ($leftmenu == 'all') $tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true
@@ -666,7 +666,7 @@ class Menubase
// Define $enabled
$enabled = true;
- if ($menu['enabled'])
+ if (isset($menu['enabled']))
{
$tmpcond = $menu['enabled'];
if ($leftmenu == 'all') $tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index cc47218e2db..f6e5c2c83d6 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -49,7 +49,6 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
$mainmenu = (empty($_SESSION["mainmenu"]) ? '' : $_SESSION["mainmenu"]);
$leftmenu = (empty($_SESSION["leftmenu"]) ? '' : $_SESSION["leftmenu"]);
-
$id = 'mainmenu';
$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
@@ -457,6 +456,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
$num = count($newTabMenu);
for ($i = 0; $i < $num; $i++)
{
+ //var_dump($type_user.' '.$newTabMenu[$i]['url'].' '.$showmode.' '.$newTabMenu[$i]['perms']);
$idsel = (empty($newTabMenu[$i]['mainmenu']) ? 'none' : $newTabMenu[$i]['mainmenu']);
$showmode = isVisibleToUserType($type_user, $newTabMenu[$i], $listofmodulesforexternal);
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 273073d7b5d..06feb97c2dd 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -4511,7 +4511,7 @@ td.cal_other_month {
.treeview ul { background-color: transparent !important; margin-top: 4px; padding-top: 4px !important; }
.treeview li { background-color: transparent !important; padding: 0 0 0 16px !important; min-height: 26px; }
.treeview .hover { color: var(--colortextlink) !important; text-decoration: underline !important; }
-
+.treeview .hitarea { margin-top: 3px; }
/* ============================================================================== */