Changeset 30561 for trunk/src/wp-includes/functions.php

Timestamp:

11/25/2014 05:00:36 AM (12 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.

File:

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

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;
     }