Changeset 10920

Timestamp:

06/29/2016 09:21:42 PM (9 years ago)

Author:

r-a-y

Message:

XProfile: Return array if we pass $user_ids as an array in `BP_XProfile_ProfileData::get_value_byid().

Previously, in r10914, we changed the behavior to calculate whether we
should return a single result by counting the number of user IDs. This
created a PHP notice for some that are relying on the return value to be
an array instead of a string.

This commit reverts this behavior and renames the $is_single variable
to $return_single_result to better explain what is happening.

See r10914 (2.6-branch).

File:

• branches/2.6/src/bp-xprofile/classes/class-bp-xprofile-profiledata.php (modified) (2 diffs)

branches/2.6/src/bp-xprofile/classes/class-bp-xprofile-profiledata.php

@@ -439 +439 @@
         }
 
-        $is_single = false;
-        $user_ids  = wp_parse_id_list( $user_ids );
-
-        if ( 1 === count( $user_ids ) ) {
-            $is_single = true;
-        }
+        $return_single_result = false;
+        if ( ! is_array( $user_ids ) ) {
+            $return_single_result = true;
+        }
+
+        $user_ids = wp_parse_id_list( $user_ids );
 
         // Assemble uncached IDs.
@@ -496 +496 @@
 
         // If a single ID was passed, just return the value.
-        if ( $is_single ) {
+        if ( $return_single_result ) {
             return $data[0]->value;