Changeset 2803 for branches/plugin/bbp-includes/bbp-user-template.php

Timestamp:

01/14/2011 02:42:23 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Correctly check for WP_Error and correctly load anonymous user cookie data/avatar. Fixes #1452. Props GautamGupta

File:

• branches/plugin/bbp-includes/bbp-user-template.php (modified) (2 diffs)

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

@@ -405 +405 @@
      * @param int $size Size of the avatar. Defaults to 40
      * @uses bbp_get_current_user_id() To get the current user id
+     * @uses bbp_get_current_anonymous_user_data() To get the current
+     *                                              anonymous user's email
      * @uses get_avatar() To get the avatar
      * @uses apply_filters() Calls 'bbp_get_current_user_avatar' with the
@@ -411 +413 @@
      */
     function bbp_get_current_user_avatar( $size = 40 ) {
-        return apply_filters( 'bbp_get_current_user_avatar', get_avatar( bbp_get_current_user_id(), $size ), $size );
+
+        if ( !$user = bbp_get_current_user_id() )
+            $user = bbp_get_current_anonymous_user_data( 'email' );
+
+        return apply_filters( 'bbp_get_current_user_avatar', get_avatar( $user, $size ), $size );
     }