golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

utf8 encode data from IPTC tags. Fixes #7495 for trunk props Txanny. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@8744 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2008-08-27 06:54:48 +00:00
parent a76720a8b7
commit 748aac2e3d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-admin/includes/image.php
View File

@ -219,17 +219,17 @@ function wp_read_image_metadata( $file ) {
if ( !empty($info['APP13']) ) {
$iptc = iptcparse($info['APP13']);
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
$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
$meta['created_timestamp'] = strtotime($iptc['2#055'][0] . ' ' . $iptc['2#060'][0]);
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
$meta['copyright'] = trim( $iptc['2#116'][0] );
$meta['copyright'] = utf8_encode(trim($iptc['2#116'][0]));
if ( !empty($iptc['2#005'][0]) ) // title
$meta['title'] = trim( $iptc['2#005'][0] );
$meta['title'] = utf8_encode(trim($iptc['2#005'][0]));
}
}