From 61c0b251c3530d046ba76f2459ab4d4747c0a223 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 31 May 2011 07:55:51 +0000 Subject: [PATCH] * IE9: enable IE dropdown menu hack only for IE<9, as it stalls IE9 www.stylite.de bug #1722 --- phpgwapi/inc/class.egw_framework.inc.php | 2 +- phpgwapi/inc/class.html.inc.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php index 834eeaad4a..82c29fc827 100644 --- a/phpgwapi/inc/class.egw_framework.inc.php +++ b/phpgwapi/inc/class.egw_framework.inc.php @@ -738,7 +738,7 @@ abstract class egw_framework $java_script = ''; // GLOBAL var to tell egroupware wether or not to enable the IE selectBox resize hack - if($GLOBALS['egw_info']['user']['preferences']['common']['enable_ie_dropdownmenuhack']) + if($GLOBALS['egw_info']['user']['preferences']['common']['enable_ie_dropdownmenuhack'] && html::$user_agent == 'msie' && html::$ua_version < 9) { $java_script .= "\n"; } diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php index 4ef8e11b84..2652da21c4 100644 --- a/phpgwapi/inc/class.html.inc.php +++ b/phpgwapi/inc/class.html.inc.php @@ -320,8 +320,8 @@ class html { $options .= ' size="'.abs($multiple).'"'; } - // fix width for MSIE in/for selectboxes - if (self::$user_agent == 'msie') + // fix width for MSIE < 9 in/for selectboxes + if (self::$user_agent == 'msie' && self::$ua_version < 9) { if (stripos($options,'onfocus="') === false) {