Changeset 6684

Timestamp:

12/28/2012 05:21:31 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Fix bug in bp_get_activity_avatar() causing incorrect alternate avatar text in activity stream comments.

File:

• trunk/bp-activity/bp-activity-template.php (modified) (3 diffs)

trunk/bp-activity/bp-activity-template.php

@@ -958 +958 @@
      */
     function bp_get_activity_avatar( $args = '' ) {
-        global $activities_template, $bp;
+        global $activities_template;
+
+        $bp = buddypress();
 
         // On activity permalink pages, default to the full-size avatar
         $type_default = bp_is_single_activity() ? 'full' : 'thumb';
 
-        if ( !empty( $activities_template->activity->display_name ) ) {
-            $dn_default = $activities_template->activity->display_name;
-        } else if ( !empty( $activities_template->current_comment->display_name ) ) {
-            $dn_default = $activities_template->current_comment->display_name;
-        }
-
-        $alt_default = isset( $dn_default ) ? sprintf( __( 'Profile picture of %s', 'buddypress' ), $activities_template->activity->display_name ) : __( 'Profile picture', 'buddypress' );
+        // Within the activity comment loop, the current activity should be set
+        // to current_comment. Otherwise, just use activity.
+        $current_activity_item = isset( $activities_template->activity->current_comment ) ? $activities_template->activity->current_comment : $activities_template->activity;
+
+        // Activity user display name
+        $dn_default  = isset( $current_activity_item->display_name ) ? $current_activity_item->display_name : '';
+
+        // Prepend some descriptive text to alt
+        $alt_default = !empty( $dn_default ) ? sprintf( __( 'Profile picture of %s', 'buddypress' ), $dn_default ) : __( 'Profile picture', 'buddypress' );
 
         $defaults = array(
@@ -983 +987 @@
 
         if ( !isset( $height ) && !isset( $width ) ) {
+
             // Backpat
             if ( isset( $bp->avatar->full->height ) || isset( $bp->avatar->thumb->height ) ) {
@@ -996 +1001 @@
                 $width = 20;
             }
-
         }
-
-        // Within the loop, we the current activity should be set first to the
-        // current_comment, if available
-        $current_activity_item = isset( $activities_template->activity->current_comment ) ? $activities_template->activity->current_comment : $activities_template->activity;
 
         // Primary activity avatar is always a user, but can be modified via a filter
         $object  = apply_filters( 'bp_get_activity_avatar_object_' . $current_activity_item->component, 'user' );
-        $item_id = $user_id ? $user_id : $current_activity_item->user_id;
+        $item_id = !empty( $user_id ) ? $user_id : $current_activity_item->user_id;
         $item_id = apply_filters( 'bp_get_activity_avatar_item_id', $item_id );
 
         // If this is a user object pass the users' email address for Gravatar so we don't have to refetch it.
-        if ( 'user' == $object && empty( $user_id ) && empty( $email ) && isset( $activities_template->activity->user_email ) )
+        if ( 'user' == $object && empty( $user_id ) && empty( $email ) && isset( $current_activity_item->user_email ) )
             $email = $current_activity_item->user_email;
 
-        return apply_filters( 'bp_get_activity_avatar', bp_core_fetch_avatar( array( 'item_id' => $item_id, 'object' => $object, 'type' => $type, 'alt' => $alt, 'class' => $class, 'width' => $width, 'height' => $height, 'email' => $email ) ) );
+        return apply_filters( 'bp_get_activity_avatar', bp_core_fetch_avatar( array(
+            'item_id' => $item_id,
+            'object'  => $object,
+            'type'    => $type,
+            'alt'     => $alt,
+            'class'   => $class,
+            'width'   => $width,
+            'height'  => $height,
+            'email'   => $email
+        ) ) );
     }