utf8 encode data from IPTC tags. Fixes #7495 for trunk props Txanny.
git-svn-id: https://develop.svn.wordpress.org/trunk@8744 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
eab05b3379
commit
903915c067
|
@ -219,17 +219,17 @@ function wp_read_image_metadata( $file ) {
|
||||||
if ( !empty($info['APP13']) ) {
|
if ( !empty($info['APP13']) ) {
|
||||||
$iptc = iptcparse($info['APP13']);
|
$iptc = iptcparse($info['APP13']);
|
||||||
if ( !empty($iptc['2#110'][0]) ) // credit
|
if ( !empty($iptc['2#110'][0]) ) // credit
|
||||||
$meta['credit'] = trim( $iptc['2#110'][0] );
|
$meta['credit'] = utf8_encode(trim($iptc['2#110'][0]));
|
||||||
elseif ( !empty($iptc['2#080'][0]) ) // byline
|
elseif ( !empty($iptc['2#080'][0]) ) // byline
|
||||||
$meta['credit'] = trim( $iptc['2#080'][0] );
|
$meta['credit'] = utf8_encode(trim($iptc['2#080'][0]));
|
||||||
if ( !empty($iptc['2#055'][0]) and !empty($iptc['2#060'][0]) ) // created datee and time
|
if ( !empty($iptc['2#055'][0]) and !empty($iptc['2#060'][0]) ) // created datee and time
|
||||||
$meta['created_timestamp'] = strtotime($iptc['2#055'][0] . ' ' . $iptc['2#060'][0]);
|
$meta['created_timestamp'] = strtotime($iptc['2#055'][0] . ' ' . $iptc['2#060'][0]);
|
||||||
if ( !empty($iptc['2#120'][0]) ) // caption
|
if ( !empty($iptc['2#120'][0]) ) // caption
|
||||||
$meta['caption'] = trim( $iptc['2#120'][0] );
|
$meta['caption'] = utf8_encode(trim($iptc['2#120'][0]));
|
||||||
if ( !empty($iptc['2#116'][0]) ) // copyright
|
if ( !empty($iptc['2#116'][0]) ) // copyright
|
||||||
$meta['copyright'] = trim( $iptc['2#116'][0] );
|
$meta['copyright'] = utf8_encode(trim($iptc['2#116'][0]));
|
||||||
if ( !empty($iptc['2#005'][0]) ) // title
|
if ( !empty($iptc['2#005'][0]) ) // title
|
||||||
$meta['title'] = trim( $iptc['2#005'][0] );
|
$meta['title'] = utf8_encode(trim($iptc['2#005'][0]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue