Ignore:
Timestamp:
05/25/10 21:55:28 (10 years ago)
Author:
rvelices
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.1/admin/include/languages.class.php

    • Property svn:eol-style set to LF
    r5452 r6356  
    9999          break; 
    100100        } 
    101          
     101 
    102102        $query = " 
    103103DELETE 
     
    148148  /** 
    149149  *  Get languages defined in the language directory 
    150   */   
     150  */ 
    151151  function get_fs_languages($target_charset = null) 
    152152  { 
     
    166166        list($language_name) = @file($path.'/iso.txt'); 
    167167 
    168         $languages[$file] = convert_charset($language_name, $target_charset); 
     168        $languages[$file] = convert_charset($language_name, 'utf-8', $target_charset); 
    169169      } 
    170170    } 
Note: See TracChangeset for help on using the changeset viewer.