Ticket #1585: 1585.diff

bp-friends.php

@@ -312 +312 @@
                                 return apply_filters( 'bp_friends_multiple_friendship_accepted_notification', '<a href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/my-friends/newest" title="' . __( 'My Friends', 'buddypress' ) . '">' . sprintf( __('%d friends accepted your friendship requests', 'buddypress' ), (int)$total_items ) . '</a>', (int)$total_items );
                         } else {
                                 $user_fullname = bp_core_get_user_displayname( $item_id );
-                                $user_url = bp_core_get_domain( $item_id );
+                                $user_url = bp_core_get_user_domain( $item_id );
                                 return apply_filters( 'bp_friends_single_friendship_accepted_notification', '<a href="' . $user_url . '?new" title="' . $user_fullname .'\'s profile">' . sprintf( __( '%s accepted your friendship request', 'buddypress' ), $user_fullname ) . '</a>', $user_fullname );
                         }
                 break;
@@ -693 +693 @@
 add_action( 'friends_friendship_deleted', 'bp_core_clear_cache' );
 add_action( 'friends_friendship_requested', 'bp_core_clear_cache' );
 
-?>
- No newline at end of file
+?>

bp-friends/bp-friends-templatetags.php

@@ -43 +43 @@
                         <ul class="horiz-gallery">
                         <?php for ( $i = 0; $i < count( $friend_ids ); $i++ ) { ?>
                                 <li>
-                                        <a href="<?php echo bp_core_get_domain( $friend_ids[$i] ) ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $friend_ids[$i], 'type' => 'thumb' ) ) ?></a>
+                                        <a href="<?php echo bp_core_get_user_domain( $friend_ids[$i] ) ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $friend_ids[$i], 'type' => 'thumb' ) ) ?></a>
                                         <h5><?php echo bp_core_get_userlink($friend_ids[$i]) ?></h5>
                                 </li>
                         <?php } ?>
@@ -197 +197 @@
                 return apply_filters( 'bp_get_total_friend_count', friends_get_total_friend_count( $user_id ) );
         }
         add_filter( 'bp_get_total_friend_count', 'number_format' );
-?>
- No newline at end of file
+?>

bp-groups.php

@@ -1515 +1515 @@
                         $group_id = $item_id;
 
                         $group = new BP_Groups_Group( $group_id, false, false );
-                        $user_url = bp_core_get_domain( $user_id );
+                        $user_url = bp_core_get_user_domain( $user_id );
 
                         if ( (int)$total_items > 1 ) {
                                 return apply_filters( 'bp_groups_multiple_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites/?n=1" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __('You have %d new group invitations', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
@@ -2735 +2735 @@
 add_action( 'groups_created_group', 'bp_core_clear_cache' );
 add_action( 'groups_group_avatar_updated', 'bp_core_clear_cache' );
 
-?>
- No newline at end of file
+?>