Changeset 30055 for trunk/src/wp-admin/includes/ajax-actions.php

Timestamp:

10/28/2014 06:34:16 PM (10 years ago)

Author:

pento

Message:

Add wp_json_encode(), a wrapper for json_encode() that ensures everything is converted to UTF-8.

Change all core calls from json_encode() to wp_json_encode().

Fixes #28786.

File:

• trunk/src/wp-admin/includes/ajax-actions.php (modified) (7 diffs)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -287 +287 @@
     }
 
-    wp_die( json_encode( $return ) );
+    wp_die( wp_json_encode( $return ) );
 }
 
@@ -1366 +1366 @@
         $markup = ob_get_clean();
 
-        echo json_encode(array(
+        echo wp_json_encode(array(
             'replace-id' => $type . '-' . $item->name,
             'markup' => $markup,
@@ -1395 +1395 @@
         wp_die( 0 );
 
-    echo json_encode( $results );
+    echo wp_json_encode( $results );
     echo "\n";
 
@@ -1841 +1841 @@
         $wp_filetype = wp_check_filetype_and_ext( $_FILES['async-upload']['tmp_name'], $_FILES['async-upload']['name'], false );
         if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) ) {
-            echo json_encode( array(
+            echo wp_json_encode( array(
                 'success' => false,
                 'data'    => array(
@@ -1856 +1856 @@
 
     if ( is_wp_error( $attachment_id ) ) {
-        echo json_encode( array(
+        echo wp_json_encode( array(
             'success' => false,
             'data'    => array(
@@ -1878 +1878 @@
         wp_die();
 
-    echo json_encode( array(
+    echo wp_json_encode( array(
         'success' => true,
         'data'    => $attachment,
@@ -1903 +1903 @@
         case 'save' :
             $msg = wp_save_image($attachment_id);
-            $msg = json_encode($msg);
+            $msg = wp_json_encode($msg);
             wp_die( $msg );
             break;