Ticket #4436: 4436-secondary-avatar-link.diff

bp-activity/bp-activity-template.php

@@ -1049 +1049 @@
                         'width'  => 20,
                         'height' => 20,
                         'class'  => 'avatar',
-                        'email'  => false
+                        'link_class'    => '',
+                        'email'  => false,
+                        'linked' => false
                 );
 
                 $r = wp_parse_args( $args, $defaults );
@@ -1070 +1072 @@
                                                         $alt = sprintf( __( 'Group logo of %s', 'buddypress' ), $group->name );
                                         }
                                 }
+                                $link = bp_get_group_permalink( $item_id );
 
                                 break;
                         case 'blogs' :
@@ -1079 +1082 @@
                                 if ( !$alt ) {
                                         $alt = sprintf( __( 'Profile picture of the author of the site %s', 'buddypress' ), get_blog_option( $item_id, 'blogname' ) );
                                 }
-
+                                $link = home_url();
+                                
                                 break;
                         case 'friends' :
                                 $object  = 'user';
@@ -1088 +1092 @@
                                 if ( empty( $alt ) ) {
                                         $alt = sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_core_get_user_displayname( $activities_template->activity->secondary_item_id ) );
                                 }
-
+                                $link = bp_core_get_userlink($item_id);
+                                
                                 break;
                         default :
                                 $object  = 'user';
@@ -1098 +1103 @@
                                 if ( !$alt ) {
                                         $alt = sprintf( __( 'Profile picture of %s', 'buddypress' ), $activities_template->activity->display_name );
                                 }
-
+                                $link = bp_core_get_userlink($item_id);
+                
                                 break;
                 }
 
-                // Allow object and item_id to be filtered
+                // Allow object, item_id, and link to be filtered
                 $object  = apply_filters( 'bp_get_activity_secondary_avatar_object_' . $activities_template->activity->component, $object );
                 $item_id = apply_filters( 'bp_get_activity_secondary_avatar_item_id', $item_id );
+                if( $linked ) $link = apply_filters('bp_get_activity_secondary_avatar_link', $link, $activities_template->activity->component);
 
                 // If we have no item_id or object, there is no avatar to display
                 if ( empty( $item_id ) || empty( $object ) )
                         return false;
+                
+                if( $linked ) {
+                        return sprintf('<a href="%s" class="%s">%s</a>',
+                                $link,
+                                $link_class,
+                                apply_filters( 'bp_get_activity_secondary_avatar', bp_core_fetch_avatar( array( 'item_id' => $item_id, 'object' => $object, 'type' => $type, 'alt' => $alt, 'class' => $class, 'width' => $width, 'height' => $height, 'email' => $email ) ) ),
+                        );
 
+                // else
                 return apply_filters( 'bp_get_activity_secondary_avatar', bp_core_fetch_avatar( array( 'item_id' => $item_id, 'object' => $object, 'type' => $type, 'alt' => $alt, 'class' => $class, 'width' => $width, 'height' => $height, 'email' => $email ) ) );
         }