Ticket #43159: 43159.3.diff

wp-includes/admin-bar.php

@@ -1348 +1348 @@
         global $show_admin_bar, $pagenow;
 
         // For all these types of requests, we never want an admin bar.
-        if ( defined( 'XMLRPC_REQUEST' ) || defined( 'DOING_AJAX' ) || defined( 'IFRAME_REQUEST' ) || wp_is_json_request() ) {
+        if ( wp_doing_xmlrpc() || defined( 'DOING_AJAX' ) || defined( 'IFRAME_REQUEST' ) || wp_is_json_request() ) {
                 return false;
         }
 

wp-includes/cron.php

@@ -887 +887 @@
         }
 
         if ( defined( 'ALTERNATE_WP_CRON' ) && ALTERNATE_WP_CRON ) {
-                if ( 'GET' !== $_SERVER['REQUEST_METHOD'] || defined( 'DOING_AJAX' ) || defined( 'XMLRPC_REQUEST' ) ) {
+                if ( 'GET' !== $_SERVER['REQUEST_METHOD'] || defined( 'DOING_AJAX' ) || wp_doing_xmlrpc() ) {
                         return false;
                 }
 

wp-includes/functions.php

@@ -3761 +3761 @@
                  * @param callable $callback Callback function name.
                  */
                 $callback = apply_filters( 'wp_die_jsonp_handler', '_jsonp_wp_die_handler' );
-        } elseif ( defined( 'XMLRPC_REQUEST' ) && XMLRPC_REQUEST ) {
+        } elseif ( wp_doing_xmlrpc() ) {
                 /**
                  * Filters the callback for killing WordPress execution for XML-RPC requests.
                  *

wp-includes/load.php

@@ -610 +610 @@
          * The 'REST_REQUEST' check here is optimistic as the constant is most
          * likely not set at this point even if it is in fact a REST request.
          */
-        if ( defined( 'XMLRPC_REQUEST' ) || defined( 'REST_REQUEST' ) || defined( 'MS_FILES_REQUEST' )
+        if ( wp_doing_xmlrpc() || defined( 'REST_REQUEST' ) || defined( 'MS_FILES_REQUEST' )
                 || ( defined( 'WP_INSTALLING' ) && WP_INSTALLING )
                 || wp_doing_ajax() || wp_is_json_request()
         ) {
@@ -1747 +1747 @@
         return apply_filters( 'wp_doing_cron', defined( 'DOING_CRON' ) && DOING_CRON );
 }
 
+ /**
+  * Determines whether the current request is a WordPress XML-RPC request.
+  *
+  * @since 6.7.0
+  *
+  * @return bool True if it's a WordPress XML-RPC request, false otherwise.
+  */
+function wp_doing_xmlrpc() {
+        /**
+         * Filters whether the current request is a WordPress XML-RPC request.
+         *
+         * @since 6.7.0
+         *
+         * @param bool $wp_doing_cron Whether the current request is a WordPress XML-RPC request.
+         */
+        return apply_filters( 'wp_doing_xmlrpc', defined( 'XMLRPC_REQUEST' ) && XMLRPC_REQUEST );
+}
+
 /**
  * Checks whether the given variable is a WordPress Error.
  *

wp-includes/post.php

@@ -7675 +7675 @@
 /**
  * Hook to schedule pings and enclosures when a post is published.
  *
- * Uses XMLRPC_REQUEST and WP_IMPORTING constants.
+ * Uses WP_IMPORTING constants.
  *
  * @since 2.3.0
  * @access private
@@ -7683 +7683 @@
  * @param int $post_id The ID of the post being published.
  */
 function _publish_post_hook( $post_id ) {
-        if ( defined( 'XMLRPC_REQUEST' ) ) {
+        if ( wp_doing_xmlrpc() ) {
                 /**
                  * Fires when _publish_post_hook() is called during an XML-RPC request.
                  *

wp-includes/user.php

@@ -352 +352 @@
         }
 
         // The 'REST_REQUEST' check here may happen too early for the constant to be available.
-        $is_api_request = ( ( defined( 'XMLRPC_REQUEST' ) && XMLRPC_REQUEST ) || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) );
+        $is_api_request = ( wp_doing_xmlrpc() || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) );
 
         /**
          * Filters whether this is an API request that Application Passwords can be used on.
@@ -3654 +3654 @@
                 return $current_user;
         }
 
-        if ( defined( 'XMLRPC_REQUEST' ) && XMLRPC_REQUEST ) {
+        if ( wp_doing_xmlrpc() ) {
                 wp_set_current_user( 0 );
                 return $current_user;
         }