diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2013-11-15 17:45:42 +0100 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2013-11-15 17:45:42 +0100 |
| commit | f9a8189423a90cbe58c63d84a6dc21beaa795abc (patch) | |
| tree | e26d02975417512666c2819e6b7f2af16b2ad033 /program/lib | |
| parent | 57def0d195c91068f29acb3823f763d1ba93e435 (diff) | |
| parent | f03ed8d9bb4525e8ccf02a2df950e6901d9bde96 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/lib')
| -rw-r--r-- | program/lib/Roundcube/rcube_browser.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube_browser.php b/program/lib/Roundcube/rcube_browser.php index 34128291b..6d5decf3e 100644 --- a/program/lib/Roundcube/rcube_browser.php +++ b/program/lib/Roundcube/rcube_browser.php @@ -37,7 +37,7 @@ class rcube_browser $this->opera = strpos($HTTP_USER_AGENT, 'opera') !== false; $this->ns4 = strpos($HTTP_USER_AGENT, 'mozilla/4') !== false && strpos($HTTP_USER_AGENT, 'msie') === false; $this->ns = ($this->ns4 || strpos($HTTP_USER_AGENT, 'netscape') !== false); - $this->ie = !$this->opera && strpos($HTTP_USER_AGENT, 'compatible; msie') !== false; + $this->ie = !$this->opera && (strpos($HTTP_USER_AGENT, 'compatible; msie') !== false || strpos($HTTP_USER_AGENT, 'trident/') !== false); $this->khtml = strpos($HTTP_USER_AGENT, 'khtml') !== false; $this->mz = !$this->ie && !$this->khtml && strpos($HTTP_USER_AGENT, 'mozilla/5') !== false; $this->chrome = strpos($HTTP_USER_AGENT, 'chrome') !== false; @@ -54,6 +54,11 @@ class rcube_browser else if ($this->ie || $this->opera) { $test = preg_match('/(msie|opera) ([0-9.]+)/', $HTTP_USER_AGENT, $regs); $this->ver = $test ? (float)$regs[2] : 0; + + // IE 11 + if (!$this->ver && preg_match('/rv:([0-9.]+)/', $HTTP_USER_AGENT, $regs)) { + $this->ver = (float) $regs[1]; + } } if (preg_match('/ ([a-z]{2})-([a-z]{2})/', $HTTP_USER_AGENT, $regs)) |