Changeset 4d4264c in github for program/include/main.inc

Timestamp:

Aug 10, 2006 3:07:43 AM (7 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

a06be98

Parents:

c0e9128

Message:

Fixed charset problems with folder renaming

File:

• program/include/main.inc (modified) (2 diffs)

program/include/main.inc

@@ -910 +910 @@
   if ($from=='UTF-7')
     $str = rcube_charset_convert(UTF7DecodeString($str), 'ISO-8859-1');
-  else if ($from=='ISO-8859-1' && function_exists('utf8_encode'))
+  else if (($from=='ISO-8859-1') && function_exists('utf8_encode'))
     $str = utf8_encode($str);
   else if ($from!='UTF-8')
@@ -920 +920 @@
   // encode string for output
   if ($to=='UTF-7')
-    return UTF7EncodeString($str);
+    return UTF7EncodeString(rcube_charset_convert($str, 'UTF-8', 'ISO-8859-1'));
   else if ($to=='ISO-8859-1' && function_exists('utf8_decode'))
     return utf8_decode($str);