summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-06-21 09:34:47 +0200
committerAleksander Machniak <alec@alec.pl>2013-06-21 09:34:47 +0200
commit9df7e17043e241b5e3d1d4739ff6d24fdeecc205 (patch)
treefa768819213de08de02d3f16211c3c03f657037f
parent07c6c69eca8751c0e96a846afb30c24ab2638b1f (diff)
Disable workaround for http://bugs.php.net/bug.php?id=18556 if PHP 5.5 is detected
-rw-r--r--program/include/rcmail.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index a0027ec54..d430cd350 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -162,7 +162,7 @@ class rcmail extends rcube
setlocale(LC_ALL, $lang . '.utf8', $lang . '.UTF-8', 'en_US.utf8', 'en_US.UTF-8');
// workaround for http://bugs.php.net/bug.php?id=18556
- if (in_array($lang, array('tr_TR', 'ku', 'az_AZ'))) {
+ if (version_compare(PHP_VERSION, '5.5.0', '<') && in_array($lang, array('tr_TR', 'ku', 'az_AZ'))) {
setlocale(LC_CTYPE, 'en_US.utf8', 'en_US.UTF-8');
}
}