iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge -r 6355 from trunk

Browse Source 
fix bug 1663 : wrong decoding of non Ascii iptc/exif (charset issue)

git-svn-id: http://piwigo.org/svn/branches/2.1@6356 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2010-05-25 19:55:28 +00:00
parent 442005ff0a
commit 7ab2dd2fac
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
admin/include/languages.class.php
View File

@@ -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);