From 372d3bf6dead9800d75a39ebfcd884da5128b64f Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 06 Sep 2010 13:06:38 -0400
Subject: [PATCH] - Fix Chrome browser was recognized as Safari
---
program/js/common.js | 4 ++--
program/include/rcube_browser.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_browser.php b/program/include/rcube_browser.php
index 1e30fc3..23ef615 100644
--- a/program/include/rcube_browser.php
+++ b/program/include/rcube_browser.php
@@ -45,7 +45,7 @@
$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 4a2a41c..ff2ab92 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -57,9 +57,9 @@
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);
--
Gitblit v1.9.1