Changeset 20424

Timestamp:

04/10/2012 04:19:53 PM (13 years ago)

Author:

duck_

Message:

Don't override the $current_user global in get_currentuserinfo() on an XML-RPC request
if it's non-empty. Fixes capabilities checks for XML-RPC requests. See #20372.

File:

• trunk/wp-includes/pluggable.php (modified) (2 diffs)

trunk/wp-includes/pluggable.php

@@ -74 +74 @@
 function get_currentuserinfo() {
     global $current_user;
-
-    if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST ) {
-        wp_set_current_user( 0 );
-        return false;
-    }
 
     if ( ! empty( $current_user ) ) {
@@ -94 +89 @@
         // $current_user has a junk value. Force to WP_User with ID 0.
         $current_user = null;
+        wp_set_current_user( 0 );
+        return false;
+    }
+
+    if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST ) {
         wp_set_current_user( 0 );
         return false;