From 50b51a03c79314ecea41a45e80e7d8f51644f71a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 2 Nov 2010 12:14:06 +0000 Subject: [PATCH] Fix: div was sometimes opened sometimes not when option USE_JQUERY_LAYOUT is on. It must never be used when option is off, always when option is on. --- htdocs/main.inc.php | 48 ++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 761cdb946d3..dd7d045d874 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 || defined('REQUIRE_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".'