Changeset 4551

Timestamp:

06/21/2011 08:39:25 PM (14 years ago)

Author:

djpaul

Message:

Change single friendship notification URL to clear the notification. Fixes #3290

File:

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

trunk/bp-friends/bp-friends-activity.php

@@ -57 +57 @@
     switch ( $action ) {
         case 'friendship_accepted':
-            if ( (int)$total_items > 1 ) {
-                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_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 );
-            }
+        $user_fullname = bp_core_get_user_displayname( $item_id );
+            if ( (int)$total_items > 1 )
+                return apply_filters( 'bp_friends_multiple_friendship_accepted_notification', '<a href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/my-friends/newest">' . sprintf( __('%d friends accepted your friendship requests', 'buddypress' ), (int)$total_items ) . '</a>', (int)$total_items );
+            else
+                return apply_filters( 'bp_friends_single_friendship_accepted_notification', '<a href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/my-friends/newest">' . sprintf( __( '%s accepted your friendship request', 'buddypress' ), $user_fullname ) . '</a>', $user_fullname );
+
             break;