Ticket #43159: 43159.diff

src/wp-includes/admin-bar.php

@@ -1130 +1130 @@
         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' ) ) {
+        if ( wp_doing_xmlrpc() || defined( 'IFRAME_REQUEST' ) ) {
                 return false;
         }
 

src/wp-includes/functions.php

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

src/wp-includes/load.php

@@ -1155 +1155 @@
 }
 
 /**
+ * Determines whether the current request is a WordPress XML-RPC request.
+ *
+ * @since 5.0.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 5.0.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 );
+}
+
+/**
  * Check whether variable is a WordPress Error.
  *
  * Returns true if $thing is an object of the WP_Error class.

src/wp-includes/user.php

@@ -2646 +2646 @@
                 return $current_user;
         }
 
-        if ( defined( 'XMLRPC_REQUEST' ) && XMLRPC_REQUEST ) {
+        if ( wp_doing_xmlrpc() ) {
                 wp_set_current_user( 0 );
                 return $current_user;
         }