Changeset 6607

Timestamp:

12/10/2012 02:25:26 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Add ability to link secondary avatars in activity streams. Props jag1989. Fixes #4436.

Location:

trunk

Files:

• bp-activity/bp-activity-template.php (modified) (7 diffs)
• bp-templates/bp-legacy/buddypress-functions.php (modified) (2 diffs)

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

@@ -1049 +1049 @@
 
         $defaults = array(
-            'type'   => 'thumb',
-            'width'  => 20,
-            'height' => 20,
-            'class'  => 'avatar',
-            'email'  => false
+            'type'       => 'thumb',
+            'width'      => 20,
+            'height'     => 20,
+            'class'      => 'avatar',
+            'link_class' => '',
+            'linked'     => true,
+            'email'      => false
         );
 
@@ -1064 +1066 @@
                 $object  = 'group';
                 $item_id = $activities_template->activity->item_id;
+                $link    = bp_get_group_permalink( groups_get_group( array( 'group_id' => $item_id ) ) );
 
                 if ( empty( $alt ) ) {
@@ -1070 +1073 @@
                     if ( bp_is_active( 'groups' ) ) {
                         $group = groups_get_group( $item_id );
-                        if ( isset( $group->name ) )
+                        if ( isset( $group->name ) ) {
                             $alt = sprintf( __( 'Group logo of %s', 'buddypress' ), $group->name );
+                        }
                     }
                 }
@@ -1079 +1083 @@
                 $object  = 'blog';
                 $item_id = $activities_template->activity->item_id;
-
-                if ( !$alt ) {
+                $link    = home_url();
+
+                if ( empty( $alt ) ) {
                     $alt = sprintf( __( 'Profile picture of the author of the site %s', 'buddypress' ), get_blog_option( $item_id, 'blogname' ) );
                 }
@@ -1088 +1093 @@
                 $object  = 'user';
                 $item_id = $activities_template->activity->secondary_item_id;
+                $link    = bp_core_get_userlink( $item_id );
 
                 if ( empty( $alt ) ) {
@@ -1098 +1104 @@
                 $item_id = $activities_template->activity->user_id;
                 $email   = $activities_template->activity->user_email;
-
-                if ( !$alt ) {
+                $link    = bp_core_get_userlink( $item_id );
+
+                if ( empty( $alt ) ) {
                     $alt = sprintf( __( 'Profile picture of %s', 'buddypress' ), $activities_template->activity->display_name );
                 }
@@ -1106 +1113 @@
         }
 
-        // 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 we have no item_id or object, there is no avatar to display
-        if ( empty( $item_id ) || empty( $object ) )
+        if ( empty( $item_id ) || empty( $object ) ) {
             return false;
-
-        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 ) ) );
+        }
+
+        // Get the avatar
+        $avatar = bp_core_fetch_avatar( array(
+            'item_id' => $item_id,
+            'object'  => $object,
+            'type'    => $type,
+            'alt'     => $alt,
+            'class'   => $class,
+            'width'   => $width,
+            'height'  => $height,
+            'email'   => $email
+        ) );
+
+        if ( !empty( $linked ) ) {
+            $link = apply_filters( 'bp_get_activity_secondary_avatar_link', $link, $activities_template->activity->component );
+
+            return sprintf( '<a href="%s" class="%s">%s</a>',
+                $link,
+                $link_class,
+                apply_filters( 'bp_get_activity_secondary_avatar', $avatar )
+            );
+        }
+
+        // else
+        return apply_filters( 'bp_get_activity_secondary_avatar', $avatar );
     }
 

trunk/bp-templates/bp-legacy/buddypress-functions.php

@@ -87 +87 @@
      */
     private function setup_actions() {
+
+        // Template Output
+        add_filter( 'bp_get_activity_action_pre_meta', array( $this, 'secondary_avatars' ), 10, 2 );
 
         /** Scripts ***********************************************************/
@@ -292 +295 @@
     public function localize_scripts() {
 
+    }
+    
+    /**
+     * Add secondary avatar image to this activity stream's record, if supported.
+     *
+     * @since BuddyPress (1.7)
+     *
+     * @param string $action The text of this activity
+     * @param BP_Activity_Activity $activity Activity object
+     * @package BuddyPress Theme
+     * @return string
+     */
+    function secondary_avatars( $action, $activity ) {
+        switch ( $activity->component ) {
+            case 'groups' :
+            case 'friends' :
+                // Only insert avatar if one exists
+                if ( $secondary_avatar = bp_get_activity_secondary_avatar() ) {
+                    $reverse_content = strrev( $action );
+                    $position        = strpos( $reverse_content, 'a<' );
+                    $action          = substr_replace( $action, $secondary_avatar, -$position - 2, 0 );
+                }
+                break;
+        }
+
+        return $action;
     }
 }