Changeset 28806 for trunk/src/wp-admin/includes/image.php

Timestamp:

06/23/2014 02:47:08 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Introduce a binary-safe wrapper for strlen() and use it in seems_utf8(), utf8_uri_encode(), and wp_read_image_metadata().

Use binary-safe POMO_Reader::strlen() in MO::export_to_file_handle().

fixes #28162.

File:

• trunk/src/wp-admin/includes/image.php (modified) (2 diffs)

trunk/src/wp-admin/includes/image.php

@@ -291 +291 @@
                 if ( empty( $meta['title'] ) ) {
                     // Assume the title is stored in 2:120 if it's short.
-                    if ( strlen( $caption ) < 80 )
+                    if ( mbstring_binary_safe_strlen( $caption ) < 80 )
                         $meta['title'] = $caption;
                     else
@@ -328 +328 @@
 
         if ( ! empty( $exif['ImageDescription'] ) ) {
-            if ( empty( $meta['title'] ) && strlen( $exif['ImageDescription'] ) < 80 ) {
+            if ( empty( $meta['title'] ) && mbstring_binary_safe_strlen( $exif['ImageDescription'] ) < 80 ) {
                 // Assume the title is stored in ImageDescription
                 $meta['title'] = trim( $exif['ImageDescription'] );