From 9df7e17043e241b5e3d1d4739ff6d24fdeecc205 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 21 Jun 2013 09:34:47 +0200
Subject: Disable workaround for http://bugs.php.net/bug.php?id=18556 if PHP
 5.5 is detected

---
 program/include/rcmail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'program/include/rcmail.php')

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');
     }
   }
-- 
cgit v1.2.3