From dfc79b341c4ae80fe3bae0c52cadee7c28a108fd Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 18 Oct 2011 06:09:32 -0400
Subject: [PATCH] Find charset in HTML meta tags if not specified in content-type header (#1488125)
---
program/include/rcube_browser.php | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_browser.php b/program/include/rcube_browser.php
index 581284a..c89c389 100644
--- a/program/include/rcube_browser.php
+++ b/program/include/rcube_browser.php
@@ -39,10 +39,10 @@
$this->unix = strstr($HTTP_USER_AGENT, 'unix');
$this->opera = strstr($HTTP_USER_AGENT, 'opera');
- $this->ns4 = strstr($HTTP_USER_AGENT, 'mozilla/4') && !strstr($HTTP_USER_AGENT, 'msie');
+ $this->ns4 = strstr($HTTP_USER_AGENT, 'mozilla/4') && !stristr($HTTP_USER_AGENT, 'msie');
$this->ns = ($this->ns4 || strstr($HTTP_USER_AGENT, 'netscape'));
- $this->ie = !$this->opera && strstr($HTTP_USER_AGENT, 'compatible; msie');
- $this->mz = strstr($HTTP_USER_AGENT, 'mozilla/5');
+ $this->ie = !$this->opera && stristr($HTTP_USER_AGENT, 'compatible; msie');
+ $this->mz = !$this->ie && strstr($HTTP_USER_AGENT, 'mozilla/5');
$this->chrome = strstr($HTTP_USER_AGENT, 'chrome');
$this->khtml = strstr($HTTP_USER_AGENT, 'khtml');
$this->safari = !$this->chrome && ($this->khtml || strstr($HTTP_USER_AGENT, 'safari'));
@@ -68,6 +68,7 @@
$this->dom = ($this->mz || $this->safari || ($this->ie && $this->ver>=5) || ($this->opera && $this->ver>=7));
$this->pngalpha = $this->mz || $this->safari || ($this->ie && $this->ver>=5.5) ||
($this->ie && $this->ver>=5 && $this->mac) || ($this->opera && $this->ver>=7) ? true : false;
+ $this->imgdata = !$this->ie;
}
}
--
Gitblit v1.9.1