Changeset 8289

Timestamp:

04/17/2014 07:08:19 PM (12 years ago)

Author:

boonebgorges

Message:

Reintroduce DISTINCT keyword to BP_Core_User::get_users()

The lack of DISTINCT was causing duplicate entries when joining against the
xprofile fields for the purposes of alphabetical sorts.

Reverts part of r7700. See #5303

Fixes #5550

Location:

branches/2.0

Files:

• bp-core/bp-core-classes.php (modified) (1 diff)
• tests/testcases/core/class-bp-core-user.php (modified) (1 diff)

branches/2.0/bp-core/bp-core-classes.php

@@ -884 +884 @@
                 $sql = array();
 
-                $sql['select_main'] = "SELECT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.display_name, u.user_email";
+                $sql['select_main'] = "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.display_name, u.user_email";
 
                 if ( 'active' == $type || 'online' == $type || 'newest' == $type  ) {

branches/2.0/tests/testcases/core/class-bp-core-user.php

@@ -104 +104 @@
         }
 
+        /**
+         * @expectedDeprecated BP_Core_User::get_users
+         * @group get_users
+         * @group type
+         */
+        public function test_type_alphabetical() {
+                $u1 = $this->create_user( array(
+                        'display_name' => 'foo',
+                ) );
+                $u2 = $this->create_user( array(
+                        'display_name' => 'bar',
+                ) );
+
+                global $wpdb;
+
+                $q = BP_Core_User::get_users( 'alphabetical' );
+                $found = array_map( 'intval', wp_list_pluck( $q['users'], 'id' ) );
+
+                $this->assertEquals( array( $u2, $u1 ), $found );
+        }
+
         public function test_get_specific_users() {
                 $u1 = $this->create_user();