summaryrefslogtreecommitdiff
path: root/program/lib/Roundcube/rcube_charset.php
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-08-27 17:45:21 +0200
committerThomas Bruederli <thomas@roundcube.net>2014-08-27 17:45:21 +0200
commita98a4f8bb56eacffff1765ff09dd29af26e5fc12 (patch)
tree68101a1906303dbd0255c77e61fb058a52296294 /program/lib/Roundcube/rcube_charset.php
parent812f37c5d1baa077f22a35240c5488f65d054260 (diff)
Remove 3rd party libs from our repository and define the dependencies in composer.json-dist.
Also remove the ancient utf8 lib and replace it with 'Patchwork UTF-8 for PHP'. For direct git checkouts, copy composer.json-dist into composer.json and run `php composer.phar install` to install the dependencies.
Diffstat (limited to 'program/lib/Roundcube/rcube_charset.php')
-rw-r--r--program/lib/Roundcube/rcube_charset.php26
1 files changed, 4 insertions, 22 deletions
diff --git a/program/lib/Roundcube/rcube_charset.php b/program/lib/Roundcube/rcube_charset.php
index ffec67376..d6ca3c052 100644
--- a/program/lib/Roundcube/rcube_charset.php
+++ b/program/lib/Roundcube/rcube_charset.php
@@ -273,17 +273,8 @@ class rcube_charset
else if ($from == 'ISO-8859-1' && function_exists('utf8_encode')) {
return utf8_encode($str);
}
- else if (class_exists('utf8')) {
- if (!$conv) {
- $conv = new utf8($from);
- }
- else {
- $conv->loadCharset($from);
- }
-
- if ($_str = $conv->strToUtf8($str)) {
- return $_str;
- }
+ else {
+ user_error("No suitable function found for UTF-8 encoding", E_USER_WARNING);
}
}
@@ -298,17 +289,8 @@ class rcube_charset
else if ($to == 'ISO-8859-1' && function_exists('utf8_decode')) {
return utf8_decode($str);
}
- else if (class_exists('utf8')) {
- if (!$conv) {
- $conv = new utf8($to);
- }
- else {
- $conv->loadCharset($from);
- }
-
- if ($_str = $conv->strToUtf8($str)) {
- return $_str;
- }
+ else {
+ user_error("No suitable function found for UTF-8 decoding", E_USER_WARNING);
}
}