From f2c1346cb7450be1c64a51f6e43d362a82153f32 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 24 May 2012 23:22:45 +0200 Subject: [PATCH] Fix: Removed warning --- htdocs/core/class/menubase.class.php | 2 +- htdocs/core/menus/standard/auguria.lib.php | 2 +- htdocs/main.inc.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php index 584b47a794a..ecdb8752b8a 100644 --- a/htdocs/core/class/menubase.class.php +++ b/htdocs/core/class/menubase.class.php @@ -558,7 +558,7 @@ class Menubase if ($menu['enabled']) { $enabled = verifCond($menu['enabled']); - if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_ACCORDION && preg_match('/^\$leftmenu/',$menu['enabled'])) $enabled=1; + if ($conf->use_javascript_ajax && ! empty($conf->global->MAIN_MENU_USE_JQUERY_ACCORDION) && preg_match('/^\$leftmenu/',$menu['enabled'])) $enabled=1; //print "verifCond rowid=".$menu['rowid']." ".$menu['enabled'].":".$enabled."
\n"; } diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php index bdaab26bb72..032ea2d500d 100644 --- a/htdocs/core/menus/standard/auguria.lib.php +++ b/htdocs/core/menus/standard/auguria.lib.php @@ -270,7 +270,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after) { if (($alt%2==0)) { - if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_ACCORDION) + if ($conf->use_javascript_ajax && ! empty($conf->global->MAIN_MENU_USE_JQUERY_ACCORDION)) { print '
'."\n"; } diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index cdfbf27cc7d..ff3778025c9 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1095,7 +1095,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a if ($conf->use_javascript_ajax) { - if ($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) + if (! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) { print '