[Svn] r3942 - in trunk/roundcubemail/program: include js

trac at roundcube.net trac at roundcube.net
Mon Sep 6 19:06:38 CEST 2010


Author: alec
Date: 2010-09-06 12:06:38 -0500 (Mon, 06 Sep 2010)
New Revision: 3942

Modified:
   trunk/roundcubemail/program/include/rcube_browser.php
   trunk/roundcubemail/program/js/common.js
Log:
- Fix Chrome browser was recognized as Safari


Modified: trunk/roundcubemail/program/include/rcube_browser.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_browser.php	2010-09-06 16:51:58 UTC (rev 3941)
+++ trunk/roundcubemail/program/include/rcube_browser.php	2010-09-06 17:06:38 UTC (rev 3942)
@@ -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);

Modified: trunk/roundcubemail/program/js/common.js
===================================================================
--- trunk/roundcubemail/program/js/common.js	2010-09-06 16:51:58 UTC (rev 3941)
+++ trunk/roundcubemail/program/js/common.js	2010-09-06 17:06:38 UTC (rev 3942)
@@ -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.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.chrome = (this.agent_lc.indexOf('chrome') > 0);
   this.iphone = (this.safari && this.agent_lc.indexOf('iphone') > 0);
   this.ipad = (this.safari && this.agent_lc.indexOf('ipad') > 0);
 

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list