Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
07/04/2011 05:50:22 PM (13 years ago)
Author:
johnjamesjacoby
Message:

First pass at reverting members/core function & filter refactor. See #3158.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-friends/bp-friends-functions.php

    r4558 r4605  
    3232        if ( !$force_accept ) {
    3333            // Add the on screen notification
    34             bp_members_add_notification( $friendship->initiator_user_id, $friendship->friend_user_id, $bp->friends->id, 'friendship_request' );
     34            bp_core_add_notification( $friendship->initiator_user_id, $friendship->friend_user_id, $bp->friends->id, 'friendship_request' );
    3535
    3636            // Send the email notification
     
    8080
    8181        // Remove the friend request notice
    82         bp_members_delete_notifications_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_request' );
     82        bp_core_delete_notifications_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_request' );
    8383
    8484        // Add a friend accepted notice for the initiating user
    85         bp_members_add_notification( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_accepted' );
     85        bp_core_add_notification( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_accepted' );
    8686
    8787        $initiator_link = bp_core_get_userlink( $friendship->initiator_user_id );
     
    126126    if ( !$friendship->is_confirmed && BP_Friends_Friendship::reject( $friendship_id ) ) {
    127127        // Remove the friend request notice
    128         bp_members_delete_notifications_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_request' );
     128        bp_core_delete_notifications_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_request' );
    129129
    130130        do_action_ref_array( 'friends_friendship_rejected', array( $friendship_id, &$friendship ) );
     
    279279
    280280    // Remove friendship requests FROM user
    281     bp_members_delete_notifications_from_user( $user_id, $bp->friends->id, 'friendship_request' );
     281    bp_core_delete_notifications_from_user( $user_id, $bp->friends->id, 'friendship_request' );
    282282
    283283    do_action( 'friends_remove_data', $user_id );
Note: See TracChangeset for help on using the changeset viewer.