Changeset 28808

Timestamp:

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

Author:

SergeyBiryukov

Message:

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

fixes #28162.

Location:

trunk/src

Files:

• wp-admin/includes/image.php (modified) (2 diffs)
• wp-includes/formatting.php (modified) (2 diffs)
• wp-includes/functions.php (modified) (1 diff)

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'] );

trunk/src/wp-includes/formatting.php

@@ -482 +482 @@
  */
 function seems_utf8($str) {
-    $length = mbstring_binary_safe_strlen($str);
+    mbstring_binary_safe_encoding();
+    $length = strlen($str);
+    reset_mbstring_encoding();
     for ($i=0; $i < $length; $i++) {
         $c = ord($str[$i]);
@@ -706 +708 @@
     $unicode_length = 0;
 
-    $string_length = mbstring_binary_safe_strlen( $utf8_string );
+    mbstring_binary_safe_encoding();
+    $string_length = strlen( $utf8_string );
+    reset_mbstring_encoding();
+
     for ($i = 0; $i < $string_length; $i++ ) {
 

trunk/src/wp-includes/functions.php

@@ -4406 +4406 @@
 
 /**
- * Uses a binary-safe encoding to get the length of a string in bytes if func_overload is enabled.
- *
- * @see mbstring_binary_safe_encoding()
- *
- * @since 4.0.0
- *
- * @param string $string The string to get the length of.
- * @return int The length of the string in bytes.
- */
-function mbstring_binary_safe_strlen( $string ) {
-    mbstring_binary_safe_encoding();
-    $length = strlen( $string );
-    reset_mbstring_encoding();
-
-    return $length;
-}
-
-/**
  * Alternative to filter_var( $var, FILTER_VALIDATE_BOOLEAN )
  *