Changeset 6356 for branches/2.1/admin

Timestamp:

May 25, 2010, 9:55:28 PM (14 years ago)

Author:

rvelices

Message:

merge -r 6355 from trunk
fix bug 1663 : wrong decoding of non Ascii iptc/exif (charset issue)

File:

• branches/2.1/admin/include/languages.class.php (modified) (3 diffs, 1 prop)

branches/2.1/admin/include/languages.class.php

@@ -99 +99 @@
           break;
         }
-        
+
         $query = "
 DELETE
@@ -148 +148 @@
   /**
   *  Get languages defined in the language directory
-  */  
+  */
   function get_fs_languages($target_charset = null)
   {
@@ -166 +166 @@
         list($language_name) = @file($path.'/iso.txt');
 
-        $languages[$file] = convert_charset($language_name, $target_charset);
+        $languages[$file] = convert_charset($language_name, 'utf-8', $target_charset);
       }
     }