Changeset 11354
- Timestamp:
- 12/29/2016 02:35:08 AM (8 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/bp-friends/bp-friends-functions.php
r11022 r11354 422 422 */ 423 423 function friends_get_recently_active( $user_id, $per_page = 0, $page = 0, $filter = '' ) { 424 $friends = bp_core_get_users( array( 425 'type' => 'active', 426 'per_page' => $per_page, 427 'page' => $page, 428 'user_id' => $user_id, 429 'search_terms' => $filter, 430 ) ); 424 431 425 432 /** … … 428 435 * @since 1.2.0 429 436 * 430 * @param array {437 * @param array $friends { 431 438 * @type int $total_users Total number of users matched by query params. 432 439 * @type array $paged_users The current page of users matched by query params. 433 440 * } 434 441 */ 435 return apply_filters( 'friends_get_recently_active', BP_Core_User::get_users( 'active', $per_page, $page, $user_id, $filter ));442 return apply_filters( 'friends_get_recently_active', $friends ); 436 443 } 437 444 … … 453 460 */ 454 461 function friends_get_alphabetically( $user_id, $per_page = 0, $page = 0, $filter = '' ) { 462 $friends = bp_core_get_users( array( 463 'type' => 'alphabetical', 464 'per_page' => $per_page, 465 'page' => $page, 466 'user_id' => $user_id, 467 'search_terms' => $filter, 468 ) ); 455 469 456 470 /** … … 459 473 * @since 1.2.0 460 474 * 461 * @return array {475 * @return array $friends { 462 476 * @type int $total_users Total number of users matched by query params. 463 477 * @type array $paged_users The current page of users matched by query params. 464 478 * } 465 479 */ 466 return apply_filters( 'friends_get_alphabetically', BP_Core_User::get_users( 'alphabetical', $per_page, $page, $user_id, $filter ));480 return apply_filters( 'friends_get_alphabetically', $friends ); 467 481 } 468 482 … … 484 498 */ 485 499 function friends_get_newest( $user_id, $per_page = 0, $page = 0, $filter = '' ) { 500 $friends = bp_core_get_users( array( 501 'type' => 'newest', 502 'per_page' => $per_page, 503 'page' => $page, 504 'user_id' => $user_id, 505 'search_terms' => $filter, 506 ) ); 486 507 487 508 /** … … 490 511 * @since 1.2.0 491 512 * 492 * @param array {513 * @param array $friends { 493 514 * @type int $total_users Total number of users matched by query params. 494 515 * @type array $paged_users The current page of users matched by query params. 495 516 * } 496 517 */ 497 return apply_filters( 'friends_get_newest', BP_Core_User::get_users( 'newest', $per_page, $page, $user_id, $filter ));518 return apply_filters( 'friends_get_newest', $friends ); 498 519 } 499 520 -
trunk/tests/phpunit/testcases/friends/functions.php
r11353 r11354 335 335 336 336 public function test_friends_get_recently_active() { 337 $this->setExpectedDeprecated( 'BP_Core_User::get_users' );338 337 $u1 = $this->factory->user->create(); 339 338 $u2 = $this->factory->user->create(); … … 358 357 359 358 public function test_friends_get_alphabetically() { 360 $this->setExpectedDeprecated( 'BP_Core_User::get_users' );361 359 $u1 = $this->factory->user->create(); 362 360 $u2 = $this->factory->user->create(); … … 370 368 xprofile_set_field_data( $field_id, $u2, 'Dave Lister' ); 371 369 xprofile_set_field_data( $field_id, $u3, 'Arnold Rimmer' ); 370 xprofile_sync_wp_profile( $u2 ); 371 xprofile_sync_wp_profile( $u3 ); 372 372 373 373 $alpha = friends_get_alphabetically( $u1 ); … … 378 378 379 379 public function test_friends_get_newest() { 380 $this->setExpectedDeprecated( 'BP_Core_User::get_users' );381 380 $u1 = $this->factory->user->create(); 382 381 $u2 = $this->factory->user->create();
Note: See TracChangeset
for help on using the changeset viewer.