Changeset 32114 for trunk/src/wp-includes/compat.php

Timestamp:

04/11/2015 11:13:01 PM (10 years ago)

Author:

azaozz

Message:

Add mb_strlen() compatibility function. Works the same way as the existing mb_substr() compatibility function.
Props SergeyBiryukov. Fixes #31951.

File:

• trunk/src/wp-includes/compat.php (modified) (1 diff)

trunk/src/wp-includes/compat.php

@@ -14 +14 @@
 }
 
-if ( !function_exists('mb_substr') ):
-    function mb_substr( $str, $start, $length=null, $encoding=null ) {
-        return _mb_substr($str, $start, $length, $encoding);
+if ( ! function_exists( 'mb_substr' ) ) :
+    function mb_substr( $str, $start, $length = null, $encoding = null ) {
+        return _mb_substr( $str, $start, $length, $encoding );
     }
 endif;
 
-function _mb_substr( $str, $start, $length=null, $encoding=null ) {
-    // the solution below, works only for utf-8, so in case of a different
-    // charset, just use built-in substr
+function _mb_substr( $str, $start, $length = null, $encoding = null ) {
+    // The solution below works only for UTF-8,
+    // so in case of a different charset just use built-in substr()
     $charset = get_option( 'blog_charset' );
-    if ( !in_array( $charset, array('utf8', 'utf-8', 'UTF8', 'UTF-8') ) ) {
-        return is_null( $length )? substr( $str, $start ) : substr( $str, $start, $length);
+    if ( ! in_array( $charset, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
+        return is_null( $length ) ? substr( $str, $start ) : substr( $str, $start, $length );
     }
-    // use the regex unicode support to separate the UTF-8 characters into an array
+    // Use the regex unicode support to separate the UTF-8 characters into an array
     preg_match_all( '/./us', $str, $match );
-    $chars = is_null( $length )? array_slice( $match[0], $start ) : array_slice( $match[0], $start, $length );
+    $chars = is_null( $length ) ? array_slice( $match[0], $start ) : array_slice( $match[0], $start, $length );
     return implode( '', $chars );
+}
+
+if ( ! function_exists( 'mb_strlen' ) ) :
+    function mb_strlen( $str, $encoding = null ) {
+        return _mb_strlen( $str, $encoding );
+    }
+endif;
+
+function _mb_strlen( $str, $encoding = null ) {
+    // The solution below works only for UTF-8,
+    // so in case of a different charset just use built-in substr()
+    $charset = get_option( 'blog_charset' );
+    if ( ! in_array( $charset, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
+        return strlen( $str );
+    }
+    // Use the regex unicode support to separate the UTF-8 characters into an array
+    preg_match_all( '/./us', $str, $match );
+    return count( $match[0] );
 }