diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-09-06 17:06:38 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-09-06 17:06:38 +0000 |
| commit | 43a45db48ddbf46a16ecbe362a086d1befaa9189 (patch) | |
| tree | 75c041ac358ce72afce41c1e1e4176fce85e20b9 /roundcubemail/program | |
| parent | 97e77fd438850dc2a27745b0efbebd20cf1f7ec9 (diff) | |
- Fix Chrome browser was recognized as Safari
git-svn-id: https://svn.roundcube.net/trunk@3942 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
| -rw-r--r-- | roundcubemail/program/include/rcube_browser.php | 2 | ||||
| -rw-r--r-- | roundcubemail/program/js/common.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roundcubemail/program/include/rcube_browser.php b/roundcubemail/program/include/rcube_browser.php index 1e30fc3a3..23ef61590 100644 --- a/roundcubemail/program/include/rcube_browser.php +++ b/roundcubemail/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/roundcubemail/program/js/common.js b/roundcubemail/program/js/common.js index 4a2a41cda..ff2ab920a 100644 --- a/roundcubemail/program/js/common.js +++ b/roundcubemail/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); |