use iconv fallbacks

WordPress · Oct 30, 2018 · bff5592 · bff5592
1 parent 3cc4700
commit bff5592
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 4 deletions.
diff --git a/lib/parser.php b/lib/parser.php
@@ -1444,7 +1444,17 @@ public function parse($input) {
 
     if ( ! function_exists( 'ucs2length' ) ) {
         function ucs2length( $string ) {
-            return (int) strlen( iconv( 'UTF-8', 'UTF-16le', $string ) ) / 2;
+            if ( function_exists( 'iconv' ) ) {
+                return (int) strlen( iconv( 'UTF-8', 'UTF-16LE', $string ) ) / 2;
+            }
+
+            if ( function_exists( 'iconv_fallback' ) ) {
+                return (int) strlen( iconv_fallback( 'UTF-8', 'UTF16-LE', $string ) );
+            }
+
+            // what should we do here?
+            // this is wrong.
+            return (int) strlen( $string );
         }
     }
 

diff --git a/packages/block-serialization-default-parser/parser.php b/packages/block-serialization-default-parser/parser.php
@@ -493,6 +493,16 @@ function add_block_from_stack( $end_offset = null ) {
 	}
 
 	static function ucs2length( $string ) {
-		return (int) strlen( iconv( 'UTF-8', 'UTF-16le', $string ) ) / 2;
+		if ( function_exists( 'iconv' ) ) {
+			return (int) strlen( iconv( 'UTF-8', 'UTF-16LE', $string ) ) / 2;
+		}
+
+		if ( function_exists( 'iconv_fallback' ) ) {
+			return (int) strlen( iconv_fallback( 'UTF-8', 'UTF16-LE', $string ) );
+		}
+
+		// what should we do here?
+		// this is wrong.
+		return (int) strlen( $string );
 	}
 }
diff --git a/packages/block-serialization-spec-parser/grammar.pegjs b/packages/block-serialization-spec-parser/grammar.pegjs
@@ -52,7 +52,17 @@
 
 if ( ! function_exists( 'ucs2length' ) ) {
     function ucs2length( $string ) {
-        return (int) strlen( iconv( 'UTF-8', 'UTF-16le', $string ) ) / 2;
+        if ( function_exists( 'iconv' ) ) {
+            return (int) strlen( iconv( 'UTF-8', 'UTF-16LE', $string ) ) / 2;
+        }
+
+        if ( function_exists( 'iconv_fallback' ) ) {
+            return (int) strlen( iconv_fallback( 'UTF-8', 'UTF16-LE', $string ) );
+        }
+
+        // what should we do here?
+        // this is wrong.
+        return (int) strlen( $string );
     }
 }
 

diff --git a/packages/block-serialization-spec-parser/index.js b/packages/block-serialization-spec-parser/index.js