Make WordPress Core

Ticket #37731: 37731.diff

File 37731.diff, 1.2 KB (added by swissspidy, 5 years ago)

swapping old and new from 33731.3.patch

  • src/wp-includes/functions.php

    diff --git src/wp-includes/functions.php src/wp-includes/functions.php
    index 204211b..0f52595 100644
    function _scalar_wp_die_handler( $message = '' ) { 
    28712871 * @return string|false The JSON encoded string, or false if it cannot be encoded.
    28722872 */
    28732873function wp_json_encode( $data, $options = 0, $depth = 512 ) {
     2874        // Prepare the data for JSON serialization.
     2875        $data = _wp_json_prepare_data( $data );
     2876
    28742877        /*
    28752878         * json_encode() has had extra params added over the years.
    28762879         * $options was added in 5.3, and $depth in 5.5.
    function wp_json_encode( $data, $options = 0, $depth = 512 ) { 
    28842887                $args = array( $data );
    28852888        }
    28862889
    2887         // Prepare the data for JSON serialization.
    2888         $args[0] = _wp_json_prepare_data( $data );
    2889 
    28902890        $json = @call_user_func_array( 'json_encode', $args );
    28912891
    28922892        // If json_encode() was successful, no need to do more sanity checking.
    function wp_json_encode( $data, $options = 0, $depth = 512 ) { 
    28972897        }
    28982898
    28992899        try {
    2900                 $args[0] = _wp_json_sanity_check( $data, $depth );
     2900                $args[0] = _wp_json_sanity_check( $args[0], $depth );
    29012901        } catch ( Exception $e ) {
    29022902                return false;
    29032903        }