diff --git src/bp-friends/bp-friends-functions.php src/bp-friends/bp-friends-functions.php
index b8d4341..f2492d4 100644
|
|
function friends_get_friendship_request_user_ids( $user_id ) { |
422 | 422 | */ |
423 | 423 | function friends_get_recently_active( $user_id, $per_page = 0, $page = 0, $filter = '' ) { |
424 | 424 | |
| 425 | $user_args = array( |
| 426 | 'type' => 'active', |
| 427 | 'per_page' => $per_page, |
| 428 | 'page' => $page, |
| 429 | 'user_id' => $user_id, |
| 430 | 'include' => $filter, |
| 431 | ); |
| 432 | |
425 | 433 | /** |
426 | 434 | * Filters a user's most recently active friends. |
427 | 435 | * |
… |
… |
function friends_get_recently_active( $user_id, $per_page = 0, $page = 0, $filte |
432 | 440 | * @type array $paged_users The current page of users matched by query params. |
433 | 441 | * } |
434 | 442 | */ |
435 | | return apply_filters( 'friends_get_recently_active', BP_Core_User::get_users( 'active', $per_page, $page, $user_id, $filter ) ); |
| 443 | return apply_filters( 'friends_get_recently_active', new BP_User_Query( $user_args ) ); |
436 | 444 | } |
437 | 445 | |
438 | 446 | /** |
… |
… |
function friends_get_recently_active( $user_id, $per_page = 0, $page = 0, $filte |
453 | 461 | */ |
454 | 462 | function friends_get_alphabetically( $user_id, $per_page = 0, $page = 0, $filter = '' ) { |
455 | 463 | |
| 464 | $user_args = array( |
| 465 | 'type' => 'alphabetical', |
| 466 | 'per_page' => $per_page, |
| 467 | 'page' => $page, |
| 468 | 'user_id' => $user_id, |
| 469 | 'include' => $filter, |
| 470 | ); |
| 471 | |
456 | 472 | /** |
457 | 473 | * Filters a user's friends listed in alphabetical order. |
458 | 474 | * |
… |
… |
function friends_get_alphabetically( $user_id, $per_page = 0, $page = 0, $filter |
463 | 479 | * @type array $paged_users The current page of users matched by query params. |
464 | 480 | * } |
465 | 481 | */ |
466 | | return apply_filters( 'friends_get_alphabetically', BP_Core_User::get_users( 'alphabetical', $per_page, $page, $user_id, $filter ) ); |
| 482 | return apply_filters( 'friends_get_alphabetically', new BP_User_Query( $user_args ) ); |
467 | 483 | } |
468 | 484 | |
469 | 485 | /** |
… |
… |
function friends_get_alphabetically( $user_id, $per_page = 0, $page = 0, $filter |
484 | 500 | */ |
485 | 501 | function friends_get_newest( $user_id, $per_page = 0, $page = 0, $filter = '' ) { |
486 | 502 | |
| 503 | $user_args = array( |
| 504 | 'type' => 'newest', |
| 505 | 'per_page' => $per_page, |
| 506 | 'page' => $page, |
| 507 | 'user_id' => $user_id, |
| 508 | 'include' => $filter, |
| 509 | ); |
| 510 | |
487 | 511 | /** |
488 | 512 | * Filters a user's friends listed from newest to oldest. |
489 | 513 | * |
… |
… |
function friends_get_newest( $user_id, $per_page = 0, $page = 0, $filter = '' ) |
494 | 518 | * @type array $paged_users The current page of users matched by query params. |
495 | 519 | * } |
496 | 520 | */ |
497 | | return apply_filters( 'friends_get_newest', BP_Core_User::get_users( 'newest', $per_page, $page, $user_id, $filter ) ); |
| 521 | return apply_filters( 'friends_get_newest', new BP_User_Query( $user_args ) ); |
498 | 522 | } |
499 | 523 | |
500 | 524 | /** |
… |
… |
function friends_notification_accepted_request( $friendship_id, $initiator_id, $ |
869 | 893 | ); |
870 | 894 | bp_send_email( 'friends-request-accepted', $initiator_id, $args ); |
871 | 895 | } |
872 | | add_action( 'friends_friendship_accepted', 'friends_notification_accepted_request', 10, 3 ); |
873 | | No newline at end of file |
| 896 | add_action( 'friends_friendship_accepted', 'friends_notification_accepted_request', 10, 3 ); |