From a6babe1cc8bc19e798a3275f1d665aed54248ca5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 15 Aug 2011 17:55:50 +0000 Subject: [PATCH] Fix: Maxi fix to make js layout working with phones --- htdocs/main.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index f7cfc6e0cd9..da67ba17afb 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -25,7 +25,7 @@ * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.760 2011/08/15 17:43:43 eldy Exp $ + * \version $Id: main.inc.php,v 1.761 2011/08/15 17:55:50 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP @@ -195,7 +195,7 @@ if (isset($_SERVER["HTTP_USER_AGENT"])) //$conf->browser->phone='android'; // Force usage of left menu when smartphone is used - if ($conf->browser->phone) $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT='forced'; + if ($conf->browser->phone && ! empty($conf->global->MAIN_MENU_FORCE_USE_JQUERY_LAYOUT)) $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT='forced'; }