diff options
| author | rvelices <rv-github@modusoptimus.com> | 2010-05-25 19:49:13 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2010-05-25 19:49:13 +0000 |
| commit | 4d013f7a32a14077988b2f359b4cb5255195c259 (patch) | |
| tree | d382a1a7eb733067983a23bddee06637c24a28c0 /admin | |
| parent | cd219bc68521d76c14aa6912012735a9f0718f35 (diff) | |
fix bug 1663 : wrong decoding of non Ascii iptc/exif (charset issue)
git-svn-id: http://piwigo.org/svn/trunk@6355 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/include/languages.class.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/admin/include/languages.class.php b/admin/include/languages.class.php index db9d17b42..053852154 100644 --- a/admin/include/languages.class.php +++ b/admin/include/languages.class.php @@ -98,7 +98,7 @@ INSERT INTO '.LANGUAGES_TABLE.' array_push($errors, 'CANNOT DEACTIVATE - LANGUAGE IS DEFAULT LANGUAGE'); break; } - + $query = " DELETE FROM ".LANGUAGES_TABLE." @@ -147,7 +147,7 @@ UPDATE '.USER_INFOS_TABLE.' /** * Get languages defined in the language directory - */ + */ function get_fs_languages($target_charset = null) { if ( empty($target_charset) ) @@ -165,7 +165,7 @@ UPDATE '.USER_INFOS_TABLE.' { 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); } } closedir($dir); |