Changeset 1814

Timestamp:

09/07/2009 07:51:46 PM (17 years ago)

Author:

apeatling

Message:

Fixing the double "You" problem on activity items that contain users that have the same name. Fixes #915

Location:

trunk

Files:

• bp-activity/bp-activity-templatetags.php (modified) (1 diff)
• bp-friends.php (modified) (1 diff)
• bp-groups.php (modified) (1 diff)

trunk/bp-activity/bp-activity-templatetags.php

@@ -288 +288 @@
                 /* Remove the 'You' and replace if with the persons name */
                 if ( $filter_you && $full_name != '' ) {
-                        $content[0] = preg_replace( "/{$full_name}[<]/", 'You<', $content[0] );                         
+                        $content[0] = preg_replace( "/{$full_name}[<]/", 'You<', $content[0], 1 );                              
                 }
         }

trunk/bp-friends.php

@@ -639 +639 @@
                         'item_id' => $friendship_id
                 ) );
+
+                $activity_content = apply_filters( 'bp_friends_friendship_accepted_activity', sprintf( __( '%s and %s are now friends', 'buddypress' ), $friend_link, $initiator_link ), &$friendship );
                 
                 /* Record in activity streams for the friend */

trunk/bp-groups.php

@@ -1408 +1408 @@
                 'content' => false,
                 'primary_link' => false,
-                'component_name' => 'groups',
+                'component_name' => $bp->groups->id,
                 'component_action' => false,
                 'item_id' => false,