WordPress 4.4.2

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

diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php
index 139d40507052d31a7c9239ec626efd97f3478635..2faccfe71a23f6f5cdafda6f50aec781155814b1 100644 (file)
--- a/wp-admin/includes/image.php
+++ b/wp-admin/includes/image.php
@@ -408,12 +408,14 @@ function wp_read_image_metadata( $file ) {
                }
        }
 
-       foreach ( $meta as &$value ) {
-               if ( is_string( $value ) ) {
-                       $value = wp_kses_post( $value );
+       foreach ( $meta['keywords'] as $key => $keyword ) {
+               if ( ! seems_utf8( $keyword ) ) {
+                       $meta['keywords'][ $key ] = utf8_encode( $keyword );
                }
        }
 
+       $meta = wp_kses_post_deep( $meta );
+
        /**
         * Filter the array of meta data read from an image's exif data.
         *