Changeset 11354

Timestamp:

12/29/2016 02:35:08 AM (10 years ago)

Author:

boonebgorges

Message:

Replace calls to deprecated user query in friends legacy functions.

Props tw2113.
Fixes #6889.

Location:

trunk

Files:

• src/bp-friends/bp-friends-functions.php (modified) (6 diffs)
• tests/phpunit/testcases/friends/functions.php (modified) (4 diffs)

trunk/src/bp-friends/bp-friends-functions.php

@@ -422 +422 @@
  */
 function friends_get_recently_active( $user_id, $per_page = 0, $page = 0, $filter = '' ) {
+        $friends = bp_core_get_users( array(
+                'type'         => 'active',
+                'per_page'     => $per_page,
+                'page'         => $page,
+                'user_id'      => $user_id,
+                'search_terms' => $filter,
+        ) );
 
         /**
@@ -428 +435 @@
          * @since 1.2.0
          *
-         * @param array {
+         * @param array $friends {
          *     @type int   $total_users Total number of users matched by query params.
          *     @type array $paged_users The current page of users matched by query params.
          * }
          */
-        return apply_filters( 'friends_get_recently_active', BP_Core_User::get_users( 'active', $per_page, $page, $user_id, $filter ) );
+        return apply_filters( 'friends_get_recently_active', $friends );
 }
 
@@ -453 +460 @@
  */
 function friends_get_alphabetically( $user_id, $per_page = 0, $page = 0, $filter = '' ) {
+        $friends = bp_core_get_users( array(
+                'type'         => 'alphabetical',
+                'per_page'     => $per_page,
+                'page'         => $page,
+                'user_id'      => $user_id,
+                'search_terms' => $filter,
+        ) );
 
         /**
@@ -459 +473 @@
          * @since 1.2.0
          *
-         * @return array {
+         * @return array $friends {
          *     @type int   $total_users Total number of users matched by query params.
          *     @type array $paged_users The current page of users matched by query params.
          * }
          */
-        return apply_filters( 'friends_get_alphabetically', BP_Core_User::get_users( 'alphabetical', $per_page, $page, $user_id, $filter ) );
+        return apply_filters( 'friends_get_alphabetically', $friends );
 }
 
@@ -484 +498 @@
  */
 function friends_get_newest( $user_id, $per_page = 0, $page = 0, $filter = '' ) {
+        $friends = bp_core_get_users( array(
+                'type'         => 'newest',
+                'per_page'     => $per_page,
+                'page'         => $page,
+                'user_id'      => $user_id,
+                'search_terms' => $filter,
+        ) );
 
         /**
@@ -490 +511 @@
          * @since 1.2.0
          *
-         * @param array {
+         * @param array $friends {
          *     @type int   $total_users Total number of users matched by query params.
          *     @type array $paged_users The current page of users matched by query params.
          * }
          */
-        return apply_filters( 'friends_get_newest', BP_Core_User::get_users( 'newest', $per_page, $page, $user_id, $filter ) );
+        return apply_filters( 'friends_get_newest', $friends );
 }
 

trunk/tests/phpunit/testcases/friends/functions.php

@@ -335 +335 @@
 
         public function test_friends_get_recently_active() {
-                $this->setExpectedDeprecated( 'BP_Core_User::get_users' );
                 $u1 = $this->factory->user->create();
                 $u2 = $this->factory->user->create();
@@ -358 +357 @@
 
         public function test_friends_get_alphabetically() {
-                $this->setExpectedDeprecated( 'BP_Core_User::get_users' );
                 $u1 = $this->factory->user->create();
                 $u2 = $this->factory->user->create();
@@ -370 +368 @@
                 xprofile_set_field_data( $field_id, $u2, 'Dave Lister' );
                 xprofile_set_field_data( $field_id, $u3, 'Arnold Rimmer' );
+                xprofile_sync_wp_profile( $u2 );
+                xprofile_sync_wp_profile( $u3 );
 
                 $alpha = friends_get_alphabetically( $u1 );
@@ -378 +378 @@
 
         public function test_friends_get_newest() {
-                $this->setExpectedDeprecated( 'BP_Core_User::get_users' );
                 $u1 = $this->factory->user->create();
                 $u2 = $this->factory->user->create();