Changeset 36430

Timestamp:

02/01/2016 02:57:53 PM (9 years ago)

Author:

ocean90

Message:

Media: In wp_read_image_metadata() make sure that IPTC keywords are UTF8 encoded.

Prevents missing _wp_attachment_metadata when an image contains keywords with latin extended characters.

Merges [36429] to the 4.4 branch.
See #35316.

Location:

branches/4.4

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/image.php (modified) (1 diff)
• src/wp-includes/kses.php (modified) (1 diff)

branches/4.4/src/wp-admin/includes/image.php

@@ -409 +409 @@
     }
 
-    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 );
 
     /**

branches/4.4/src/wp-includes/kses.php

@@ -1582 +1582 @@
 
 /**
+ * Navigates through an array, object, or scalar, and sanitizes content for
+ * allowed HTML tags for post content.
+ *
+ * @since 4.4.2
+ *
+ * @param mixed $value The array or string to filter.
+ * @return mixed $value The filtered content.
+ */
+function wp_kses_post_deep( $data ) {
+    return map_deep( $data, 'wp_kses_post' );
+}
+
+/**
  * Strips all of the HTML in the content.
  *