From b16d0c9371995e2936875de61aefb2ee1b779f0f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Nov 2010 15:13:38 +0000 Subject: [PATCH] Fix: test on option MAIN_MENU_USE_JQUERY_LAYOUT was not done everywhere. This fix borken feature in ecm when MAIN_MENU_USE_JQUERY_LAYOUT is not used. USage when option is one is still broken. --- htdocs/main.inc.php | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 47d21d80c10..af14f4ee6f1 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -863,7 +863,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs print ''."\n"; print ''."\n"; print ''."\n"; - + if ($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) { print ''."\n"; @@ -942,9 +942,9 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a // For backward compatibility with old modules if (empty($conf->headerdone)) top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); - + print ''; - + if ($conf->use_javascript_ajax) { if ($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) @@ -997,7 +997,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a } '; } - + if ($conf->global->MAIN_MENU_USE_JQUERY_ACCORDION) { print "\n".'