Changeset 8744

Timestamp:

08/27/2008 06:54:48 AM (16 years ago)

Author:

westi

Message:

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

File:

• trunk/wp-admin/includes/image.php (modified) (1 diff)

trunk/wp-admin/includes/image.php

@@ -220 +220 @@
             $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]));
          }
     }