summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-09-06 17:06:38 +0000
committeralecpl <alec@alec.pl>2010-09-06 17:06:38 +0000
commit372d3bf6dead9800d75a39ebfcd884da5128b64f (patch)
tree9f0a1954cdbc5b848e5552a5c8cb7eb7ab1f6119
parent3e15dbfa588cfa0ee11a2b514c12fa6a8938cee9 (diff)
- Fix Chrome browser was recognized as Safari
-rw-r--r--program/include/rcube_browser.php2
-rw-r--r--program/js/common.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/program/include/rcube_browser.php b/program/include/rcube_browser.php
index 1e30fc3a3..23ef61590 100644
--- a/program/include/rcube_browser.php
+++ b/program/include/rcube_browser.php
@@ -45,7 +45,7 @@ class rcube_browser
$this->mz = stristr($HTTP_USER_AGENT, 'mozilla/5');
$this->chrome = stristr($HTTP_USER_AGENT, 'chrome');
$this->khtml = stristr($HTTP_USER_AGENT, 'khtml');
- $this->safari = ($this->khtml || stristr($HTTP_USER_AGENT, 'safari'));
+ $this->safari = !$this->chrome && ($this->khtml || stristr($HTTP_USER_AGENT, 'safari'));
if ($this->ns || $this->chrome) {
$test = preg_match('/(mozilla|chrome)\/([0-9.]+)/i', $HTTP_USER_AGENT, $regs);
diff --git a/program/js/common.js b/program/js/common.js
index 4a2a41cda..ff2ab920a 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -57,9 +57,9 @@ function roundcube_browser()
this.ns = ((this.ver < 5 && this.name == 'Netscape') || (this.ver >= 5 && this.vendor.indexOf('Netscape') >= 0));
this.ns6 = (this.ns && parseInt(this.vendver) == 6); // (this.mz && this.ns) ? true : false;
this.ns7 = (this.ns && parseInt(this.vendver) == 7); // this.agent.indexOf('Netscape/7')>0);
- this.safari = (this.agent_lc.indexOf('safari') > 0 || this.agent.toLowerCase().indexOf('applewebkit') > 0);
- this.konq = (this.agent_lc.indexOf('konqueror') > 0);
this.chrome = (this.agent_lc.indexOf('chrome') > 0);
+ this.safari = (!this.chrome && (this.agent_lc.indexOf('safari') > 0 || this.agent.toLowerCase().indexOf('applewebkit') > 0));
+ this.konq = (this.agent_lc.indexOf('konqueror') > 0);
this.iphone = (this.safari && this.agent_lc.indexOf('iphone') > 0);
this.ipad = (this.safari && this.agent_lc.indexOf('ipad') > 0);