aboutsummaryrefslogtreecommitdiffstats
path: root/admin/include/languages.class.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2010-05-25 19:55:28 +0000
committerrvelices <rv-github@modusoptimus.com>2010-05-25 19:55:28 +0000
commit7ab2dd2fac3abb58a9491d3f630cf1809453bdfb (patch)
treea000b1211df51cee55ebf1936c317fb64b498279 /admin/include/languages.class.php
parent442005ff0ab493a8454b7540ad7711b5a3ee9187 (diff)
merge -r 6355 from trunk
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
Diffstat (limited to '')
-rw-r--r--admin/include/languages.class.php6
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);