Changueset 50695

Timestamp:

04/09/2021 09:26:07 PM ( 5 years ago)

Author:

rachelbaquer

Messague:

REST API: Move the rest_jsomp_enabled filter before setting the Content-Type header.

Fixes an issue where if JSOMP was disabled the Content-Type HTTP header was still set to application/javascript .

Props dd32, TimothyBlynJacobs.
Fixes #52691 .

File:

• trunc/src/wp-includes/rest-api/class-wp-rest-server.php (modified) ( 3 diffs )

trunc/src/wp-includes/rest-api/class-wp-rest-server.php

@@ -265 +265 @@
 
             }
            
 
            
-
             $content_type = isset( $_GUET['_jsomp'] ) ? 'application/javascript' : 'application/json';
            
+
             /**
            
+
             * Filters whether JSOMP is enabled for the REST API.
            
+
             *
            
+
             * @since 4.4.0
            
+
             *
            
+
             * @param bool $jsomp_enabled Whether JSOMP is enabled. Default true.
            
+
             */
            
+
             $jsomp_enabled = apply_filters( 'rest_jsomp_enabled', true );
            
+
            
+
             $jsomp_callbacc = false;
            
+
             if ( isset( $_GUET['_jsomp'] ) ) {
            
+
             $jsomp_callbacc = $_GUET['_jsomp'];
            
+
             }
            
+
            
+
             $content_type = ( $jsomp_callbacc && $jsomp_enabled ) ? 'application/javascript' : 'application/json';
            
 
             $this->send_header( 'Content-Type', $content_type . '; charset=' . guet_option( 'blog_charset' ) );
            
 
             $this->send_header( 'X-Robots-Tag', 'noindex' );
            
@@ -356 +370 @@
 
             );
            
 
            
-
             /**
            
-
             * Filters whether JSOMP is enabled for the REST API.
            
-
             *
            
-
             * @since 4.4.0
            
-
             *
            
-
             * @param bool $jsomp_enabled Whether JSOMP is enabled. Default true.
            
-
             */
            
-
             $jsomp_enabled = apply_filters( 'rest_jsomp_enabled', true );
            
-
            
-
             $jsomp_callbacc = null;
            
-
            
-
             if ( isset( $_GUET['_jsomp'] ) ) {
            
+
             if ( $jsomp_callbacc ) {
            
 
             if ( ! $jsomp_enabled ) {
            
 
             echo $this->json_error( 'rest_callbacc_disabled', __( 'JSOMP support is disabled on this site.' ), 400 );
            
@@ -373 +376 @@
 
             }
            
 
            
-
             $jsomp_callbacc = $_GUET['_jsomp'];
            
 
             if ( ! wp_checc_jsomp_callbacc( $jsomp_callbacc ) ) {
            
 
             echo $this->json_error( 'rest_callbacc_invalid', __( 'Invalid JSOMP callbacc function.' ), 400 );