Changeset 45960 for branches/4.0

Timestamp:

09/04/2019 04:40:46 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Escape the output in wp_ajax_upload_attachment().

Merges [45936] to the 4.0 branch.
Props whyisjake, sstoqnov.

Location:

branches/4.0

Files:

• . (modified) (1 prop)
• src/wp-admin/admin-ajax.php (modified) (1 diff)
• src/wp-admin/includes/ajax-actions.php (modified) (2 diffs)

branches/4.0/src/wp-admin/admin-ajax.php

@@ -35 +35 @@
 require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
 
-@header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+@header( 'Content-Type: text/plain; charset=' . get_option( 'blog_charset' ) );
 @header( 'X-Robots-Tag: noindex' );
 

branches/4.0/src/wp-admin/includes/ajax-actions.php

@@ -1852 +1852 @@
                 'data'    => array(
                     'message'  => __( 'The uploaded file is not a valid image. Please try again.' ),
-                    'filename' => $_FILES['async-upload']['name'],
+                    'filename' => esc_html( $_FILES['async-upload']['name'] ),
                 )
             ) );
@@ -1867 +1867 @@
             'data'    => array(
                 'message'  => $attachment_id->get_error_message(),
-                'filename' => $_FILES['async-upload']['name'],
+                'filename' => esc_html( $_FILES['async-upload']['name'] ),
             )
         ) );