Ticket #30471: 30471.diff

src/wp-includes/functions.php

@@ -2662 +2662 @@
         $json = call_user_func_array( 'json_encode', $args );
 
         // If json_encode() was successful, no need to do more sanity checking.
-        if ( false !== $json ) {
+        if ( false !== $json && 'null' !== $json ) {
                 return $json;
         }
 
+        // json_encode() can sometimes return 'null' for strings it couldn't handle,
+        // so we should only return 'null' if null was given to us.
+        if ( null === $data && 'null' === $json ) {
+                return null;
+        }
+
         try {
                 $args[0] = _wp_json_sanity_check( $data, $depth );
         } catch ( Exception $e ) {

tests/phpunit/tests/functions.php

@@ -554 +554 @@
 
                 $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( '"a\u3042b"', wp_json_encode( $eucjp ) );
 
-                $this->assertEquals( $expected, wp_json_encode( $eucjp ) );
-
                 mb_detect_order( $old_charsets );
         }