From: Michael M Slusarz Date: Tue, 7 Apr 2009 04:57:53 +0000 (-0600) Subject: Make dimp work with IE 8 for now. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=b64bb8c686c2704640c48dd3098d32562aa2e05a;p=horde.git Make dimp work with IE 8 for now. --- diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES index 33352dbb8..2df211f3c 100644 --- a/imp/docs/CHANGES +++ b/imp/docs/CHANGES @@ -2280,6 +2280,8 @@ OLD DIMP CHANGELOG v1.1.2 ------ +[mms] Make dimp work with IE 8 (uses IE 7 compatibility mode) (requires IMP + 4.3.4+). [mms] Add confirmation box if attempting to send message without subject (Request #8076). [mms] Fix address autocomplete display on IE (Bug #7982). diff --git a/imp/lib/DIMP.php b/imp/lib/DIMP.php index 1d3a298cc..e22f37851 100644 --- a/imp/lib/DIMP.php +++ b/imp/lib/DIMP.php @@ -104,11 +104,19 @@ class DIMP echo '' . "\n" . (!empty($GLOBALS['language']) ? '\n". - "\n" . - '' . htmlspecialchars($page_title) . "\n" . + "\n"; + + // TODO: Make dimp work with IE 8 standards mode + if ($GLOBALS['browser']->isBrowser('msie') && + ($GLOBALS['browser']->getMajor() == 8)) { + echo '' . "\n"; + } + + echo '' . htmlspecialchars($page_title) . "\n" . '\n". IMP::wrapInlineScript(DIMP::_includeDIMPJSVars()); + IMP::includeStylesheetFiles(true, 'dimp'); echo "\n"; diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php index c71c405ca..7c6c739e3 100644 --- a/imp/lib/IMP.php +++ b/imp/lib/IMP.php @@ -1725,7 +1725,8 @@ class IMP switch ($GLOBALS['browser']->getBrowser()) { case 'msie': $ie_major = $GLOBALS['browser']->getMajor(); - if ($ie_major == 7) { + // TODO: IE8 specific styling + if ($ie_major >= 7) { $browser_css[] = 'ie7.css'; $browser_css[] = 'ie7-dimp.css'; } elseif ($ie_major < 7) {