Changeset 45206

Timestamp:

04/15/2019 11:48:11 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Bootstrap/Load: After [45016], make sure wp_die() does not cause _doing_it_wrong() notices if called before $wp_query global is set.

Props tmdesigned, TimothyBlynJacobs.
Fixes #46813.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (3 diffs)
• tests/phpunit/tests/includes/helpers.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -2946 +2946 @@
  * @since 5.1.0 The `$link_url`, `$link_text`, and `$exit` arguments were added.
  *
+ * @global WP_Query $wp_query Global WP_Query instance.
+ *
  * @param string|WP_Error  $message Optional. Error message. If this is a WP_Error object,
  *                                  and not an Ajax or XML-RPC request, the error's messages are used.
@@ -2972 +2974 @@
  */
 function wp_die( $message = '', $title = '', $args = array() ) {
+    global $wp_query;
 
     if ( is_int( $args ) ) {
@@ -3017 +3020 @@
         $function = apply_filters( 'wp_die_xmlrpc_handler', '_xmlrpc_wp_die_handler' );
     } elseif ( wp_is_xml_request()
-        || function_exists( 'is_feed' ) && is_feed()
-        || function_exists( 'is_comment_feed' ) && is_comment_feed()
-        || function_exists( 'is_trackback' ) && is_trackback() ) {
+        || isset( $wp_query ) &&
+            ( function_exists( 'is_feed' ) && is_feed()
+            || function_exists( 'is_comment_feed' ) && is_comment_feed()
+            || function_exists( 'is_trackback' ) && is_trackback() ) ) {
         /**
          * Filters the callback for killing WordPress execution for XML requests.

trunk/tests/phpunit/tests/includes/helpers.php

@@ -276 +276 @@
 
     /**
+     * @ticket 46813
+     * @expectedException WPDieException
+     */
+    public function test_die_handler_should_not_cause_doing_it_wrong_notice_without_wp_query_set() {
+        unset( $GLOBALS['wp_query'] );
+
+        wp_die();
+
+        $this->assertEmpty( $this->caught_doing_it_wrong );
+    }
+
+    /**
      * @ticket 45933
      * @dataProvider data_die_process_input