summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/config/user_agents.php3
-rw-r--r--system/core/Output.php2
2 files changed, 3 insertions, 2 deletions
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
index 7f86d2dfc..35c36cb42 100644
--- a/application/config/user_agents.php
+++ b/application/config/user_agents.php
@@ -101,7 +101,8 @@ $browsers = array(
'Links' => 'Links',
'hotjava' => 'HotJava',
'amaya' => 'Amaya',
- 'IBrowse' => 'IBrowse'
+ 'IBrowse' => 'IBrowse',
+ 'Maxthon' => 'Maxthon'
);
$mobiles = array(
diff --git a/system/core/Output.php b/system/core/Output.php
index cf5178a0c..a20841463 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -772,7 +772,7 @@ class CI_Output {
$output = str_replace($codes_messed[0], $codes_clean[0], $output);
}
- if ( ! empty($codes_clean))
+ if ( ! empty($textareas_clean))
{
preg_match_all('{<textarea.+</textarea>}msU', $output, $textareas_messed);
$output = str_replace($textareas_messed[0], $textareas_clean[0], $output);