Ticket #37731: 37731.6.patch

src/wp-admin/includes/class-language-pack-upgrader.php

@@ -282 +282 @@
 
                 // Re-add upgrade hooks.
                 add_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
-                add_action( 'upgrader_process_complete', 'wp_version_check' );
-                add_action( 'upgrader_process_complete', 'wp_update_plugins' );
-                add_action( 'upgrader_process_complete', 'wp_update_themes' );
+                add_action( 'upgrader_process_complete', 'wp_version_check', 10, 0 );
+                add_action( 'upgrader_process_complete', 'wp_update_plugins', 10, 0 );
+                add_action( 'upgrader_process_complete', 'wp_update_themes', 10, 0 );
 
                 $this->skin->bulk_footer();
 

src/wp-includes/functions.php

@@ -2871 +2871 @@
  * @return string|false The JSON encoded string, or false if it cannot be encoded.
  */
 function wp_json_encode( $data, $options = 0, $depth = 512 ) {
+        // Prepare the data for JSON serialization.
+        $data = _wp_json_prepare_data( $data );
+
         /*
          * json_encode() has had extra params added over the years.
          * $options was added in 5.3, and $depth in 5.5.
@@ -2884 +2887 @@
                 $args = array( $data );
         }
 
-        // Prepare the data for JSON serialization.
-        $args[0] = _wp_json_prepare_data( $data );
 
         $json = @call_user_func_array( 'json_encode', $args );
 
@@ -2897 +2898 @@
         }
 
         try {
-                $args[0] = _wp_json_sanity_check( $data, $depth );
+                $args[0] = _wp_json_sanity_check( $args[0], $depth );
         } catch ( Exception $e ) {
                 return false;
         }