diff --git a/ChangeLog b/ChangeLog index 3d3ea71b1..948650a72 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ phpMyAdmin - ChangeLog $Id$ $Source$ +2006-10-13 Marc Delisle + * css/phpmyadmin.css.php: bug #1517428, some IE 6 versions have + problems loading CSS when zlip.output_compression is on, + thanks to Juergen Wind + 2006-10-12 Marc Delisle * tbl_change.php: bug #1566219, automated timestamp values diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php index 372110ebb..61397a785 100644 --- a/css/phpmyadmin.css.php +++ b/css/phpmyadmin.css.php @@ -7,6 +7,13 @@ define('PMA_MINIMUM_COMMON', true); require_once './libraries/common.lib.php'; require_once './libraries/sqlparser.lib.php'; +// MSIE 6 (at least some unpatched versions) has problems loading CSS +// when zlib_compression is on +if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER == '6' + && (ini_get('zlib.output_compression')) ) { + ini_set('zlib.output_compression', 'Off'); +} + if ($GLOBALS['text_dir'] === 'ltr') { $right = 'right'; $left = 'left';