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

Timestamp:

06/23/2014 10:20:23 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Remove mbstring_binary_safe_strlen(). Use mbstring_binary_safe_encoding() and reset_mbstring_encoding() directly.

fixes #28162.

File:

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

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

@@ -290 +290 @@
                 $caption = trim( $iptc['2#120'][0] );
                 if ( empty( $meta['title'] ) ) {
+                    mbstring_binary_safe_encoding();
+                    $caption_length = strlen( $caption );
+                    reset_mbstring_encoding();
+
                     // Assume the title is stored in 2:120 if it's short.
-                    if ( mbstring_binary_safe_strlen( $caption ) < 80 )
+                    if ( $caption_length < 80 ) {
                         $meta['title'] = $caption;
-                    else
+                    } else {
                         $meta['caption'] = $caption;
+                    }
                 } elseif ( $caption != $meta['title'] ) {
                     $meta['caption'] = $caption;
@@ -328 +333 @@
 
         if ( ! empty( $exif['ImageDescription'] ) ) {
-            if ( empty( $meta['title'] ) && mbstring_binary_safe_strlen( $exif['ImageDescription'] ) < 80 ) {
+            mbstring_binary_safe_encoding();
+            $description_length = strlen( $exif['ImageDescription'] );
+            reset_mbstring_encoding();
+
+            if ( empty( $meta['title'] ) && $description_length < 80 ) {
                 // Assume the title is stored in ImageDescription
                 $meta['title'] = trim( $exif['ImageDescription'] );