Permalink
Browse files

merge r24967 from branch 2.5 to trunk

bug 2973 fixed: automatically use encoding windows-1252 instead of iso-8859-1
(unless we find utf-8 signs) on IPTC before converting to utf-8



git-svn-id: http://piwigo.org/svn/trunk@24968 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information...
plegall committed Oct 17, 2013
1 parent 5abcfcc commit a397debf025bab70a7975e127c6bad6db5f6216b
Showing with 19 additions and 3 deletions.
  1. +19 −3 include/functions_metadata.inc.php
@@ -102,9 +102,25 @@ function clean_iptc_value($value)
$value = trigger_event('clean_iptc_value', $value);
if ( ($qual = qualify_utf8($value)) != 0)
{// has non ascii chars
$value = convert_charset( $value,
$qual>0 ? 'utf-8' : 'iso-8859-1',
get_pwg_charset() );
if ($qual>0)
{
$input_encoding = 'utf-8';
}
else
{
$input_encoding = 'iso-8859-1';
if (function_exists('iconv') or function_exists('mb_convert_encoding'))
{
// using windows-1252 because it supports additional characters
// such as "oe" in a single character (ligature). About the
// difference between Windows-1252 and ISO-8859-1: the characters
// 0x80-0x9F will not convert correctly. But these are control
// characters which are almost never used.
$input_encoding = 'windows-1252';
}
}
$value = convert_charset($value, $input_encoding, get_pwg_charset());
}
}
return $value;

0 comments on commit a397deb

Please sign in to comment.