Changeset 2822 for trunk/bp-friends.php

Timestamp:

03/08/2010 04:20:25 PM (16 years ago)

Author:

apeatling

Message:

Merge 1.2 branch with trunk

File:

• trunk/bp-friends.php (modified) (8 diffs)

trunk/bp-friends.php

@@ -99 +99 @@
 
         // Delete any friendship acceptance notifications for the user when viewing a profile
-        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'friends', 'friendship_accepted' );
+        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->friends->id, 'friendship_accepted' );
 
         do_action( 'friends_screen_my_friends' );
@@ -133 +133 @@
 
         do_action( 'friends_screen_requests' );
+
+        if ( isset( $_GET['new'] ) )
+                bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->friends->id, 'friendship_request' );
 
         bp_core_load_template( apply_filters( 'friends_template_requests', 'members/single/home' ) );
@@ -318 +321 @@
                 case 'friendship_request':
                         if ( (int)$total_items > 1 ) {
-                                return apply_filters( 'bp_friends_multiple_friendship_request_notification', '<a href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/requests" title="' . __( 'Friendship requests', 'buddypress' ) . '">' . sprintf( __('You have %d pending friendship requests', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
+                                return apply_filters( 'bp_friends_multiple_friendship_request_notification', '<a href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/requests/?new" title="' . __( 'Friendship requests', 'buddypress' ) . '">' . sprintf( __('You have %d pending friendship requests', 'buddypress' ), (int)$total_items ) . '</a>', $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_request_notification', '<a href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/requests" title="' . __( 'Friendship requests', 'buddypress' ) . '">' . sprintf( __('You have a friendship request from %s', 'buddypress' ), $user_fullname ) . '</a>', $user_fullname );
+                                return apply_filters( 'bp_friends_single_friendship_request_notification', '<a href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/requests/?new" title="' . __( 'Friendship requests', 'buddypress' ) . '">' . sprintf( __('You have a friendship request from %s', 'buddypress' ), $user_fullname ) . '</a>', $user_fullname );
                         }
                 break;
@@ -363 +366 @@
                 if ( !$force_accept ) {
                         // Add the on screen notification
-                        bp_core_add_notification( $friendship->initiator_user_id, $friendship->friend_user_id, 'friends', 'friendship_request' );
+                        bp_core_add_notification( $friendship->initiator_user_id, $friendship->friend_user_id, $bp->friends->id, 'friendship_request' );
 
                         // Send the email notification
@@ -409 +412 @@
 
                 /* Remove the friend request notice */
-                bp_core_delete_notifications_for_user_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, 'friends', 'friendship_request' );
+                bp_core_delete_notifications_for_user_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_request' );
 
                 /* Add a friend accepted notice for the initiating user */
-                bp_core_add_notification( $friendship->friend_user_id, $friendship->initiator_user_id, 'friends', 'friendship_accepted' );
+                bp_core_add_notification( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_accepted' );
 
                 $initiator_link = bp_core_get_userlink( $friendship->initiator_user_id );
@@ -450 +453 @@
         if ( !$friendship->is_confirmed && BP_Friends_Friendship::reject( $friendship_id ) ) {
                 // Remove the friend request notice
-                bp_core_delete_notifications_for_user_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, 'friends', 'friendship_request' );
+                bp_core_delete_notifications_for_user_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_request' );
 
                 do_action( 'friends_friendship_rejected', $friendship_id, &$friendship );
@@ -598 +601 @@
 
         /* Remove friendship requests FROM user */
-        bp_core_delete_notifications_from_user( $user_id, $bp->friends->slug, 'friendship_request' );
+        bp_core_delete_notifications_from_user( $user_id, $bp->friends->id, 'friendship_request' );
 
         do_action( 'friends_remove_data', $user_id );
@@ -632 +635 @@
 
         if ( isset($_GET['new']) )
-                bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'friends', 'friendship_accepted' );
+                bp_core_delete_notifications_for_user_by_type( $bp->displayed_user->id, $bp->friends->id, 'friendship_accepted' );
 }
 add_action( 'bp_activity_screen_my_activity', 'friends_clear_friend_notifications' );