Wordpress 2.6.2

[autoinstalls/wordpress.git] / wp-admin / includes / image.php

diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php
index 7699f98608f330612a811b247d18d7769397849f..8de2907994ed1613f36a3068ec96aab306ec439d 100644 (file)
--- a/wp-admin/includes/image.php
+++ b/wp-admin/includes/image.php
@@ -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
                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
                        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
                        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
                        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]));

                 }
        }
 
                 }
        }