Changeset 2819 for branches/plugin

Timestamp:

01/22/2011 06:35:59 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Stop XMLRPC from complaining when bbPress is activated. Remove needless isset() checks in bbp_get_user_id(). Fixes #1458

Location:

branches/plugin

Files:

• bbp-includes/bbp-user-template.php (modified) (1 diff)
• bbpress.php (modified) (2 diffs)

branches/plugin/bbp-includes/bbp-user-template.php

@@ -43 +43 @@
 
         // Currently viewing or editing a user
-        elseif ( ( true == $displayed_user_fallback ) && !empty( $bbp->displayed_user->ID ) && isset( $bbp->displayed_user->ID ) )
+        elseif ( ( true == $displayed_user_fallback ) && !empty( $bbp->displayed_user->ID ) )
             $bbp_user_id = $bbp->displayed_user->ID;
 
         // Maybe fallback on the current_user ID
-        elseif ( ( true == $current_user_fallback ) && !empty( $bbp->current_user->ID ) && isset( $bbp->current_user->ID ) )
+        elseif ( ( true == $current_user_fallback ) && !empty( $bbp->current_user->ID ) )
             $bbp_user_id = $bbp->current_user->ID;
 

branches/plugin/bbpress.php

@@ -701 +701 @@
      * Setup the currently logged-in user
      *
+     * Do not to call this prematurely, I.E. before the 'init' action has
+     * started. This function is naturally hooked into 'init' to ensure proper
+     * execution. get_currentuserinfo() is used to check for XMLRPC_REQUEST to
+     * avoid xmlrpc errors.
+     *
      * @since bbPress (r2697)
      *
+     * @uses get_currentuserinfo()
      * @global WP_User Current user object
      */
@@ -708 +714 @@
         global $current_user;
 
-        // Load current user if somehow it hasn't been set yet
-        // @todo Load current user somehow
         if ( !isset( $current_user ) )
-            wp_die( 'Loading the user too soon!' );
-
-        // Set bbPress current user to WordPress current user
+            $current_user = get_currentuserinfo();
+
+        // Set the current user in the bbPress global
         $this->current_user = $current_user;
     }