Changeset 30561

Timestamp:

11/25/2014 05:00:36 AM (10 years ago)

Author:

pento

Message:

When json_encode() returns a JSON string containing 'null' in PHP 5.4 or earlier, wp_json_encode() will now sanity check the data, as older versions of PHP failed to encode non UTF-8 characters correctly, instead returning 'null'.

Fixes #30471.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (1 diff)
• tests/phpunit/tests/functions.php (modified) (2 diffs)

trunk/src/wp-includes/functions.php

@@ -2663 +2663 @@
 
     // If json_encode() was successful, no need to do more sanity checking.
-    if ( false !== $json ) {
+    // ... unless we're in an old version of PHP, and json_encode() returned
+    // a string containing 'null'. Then we need to do more sanity checking.
+    if ( false !== $json && ( version_compare( PHP_VERSION, '5.5', '>=' ) || false === strpos( $json, 'null' ) ) )  {
         return $json;
     }

trunk/tests/phpunit/tests/functions.php

@@ -555 +555 @@
         $this->assertEquals( 'aあb', $utf8 );
 
-        // json_encode() returns different things in different PHP versions.
-        // See: https://core.trac.wordpress.org/ticket/30471
-        if ( version_compare( PHP_VERSION, '5.5', '>=' ) ) {
-            $expected = '"a\u3042b"';
-        } else {
-            $expected = 'null';
-        }
-
-        $this->assertEquals( $expected, wp_json_encode( $eucjp ) );
+        $this->assertEquals( '"a\u3042b"', wp_json_encode( $eucjp ) );
 
         mb_detect_order( $old_charsets );
@@ -583 +575 @@
         $this->assertEquals( 'aあb', $utf8 );
 
-        // json_encode() returns different things in different PHP versions.
-        // See: https://core.trac.wordpress.org/ticket/30471
-        if ( version_compare( PHP_VERSION, '5.5', '>=' ) ) {
-            $expected = '["c","a\u3042b"]';
-        } else {
-            $expected = '["c",null]';
-        }
-
-        $this->assertEquals( $expected, wp_json_encode( array( 'c', $eucjp ) ) );
+        $this->assertEquals( '["c","a\u3042b"]', wp_json_encode( array( 'c', $eucjp ) ) );
 
         mb_detect_order( $old_charsets );