Changeset 8133 for trunk/bp-activity/bp-activity-functions.php

Timestamp:

03/14/2014 01:04:58 AM (13 years ago)

Author:

boonebgorges

Message:

Use WP's array format for get_meta() functions when no $meta_key is provided

Passing only an object_id to a get_meta() function in WP will return an array
of arrays, keyed by meta_keys, each containing a list of meta_values for that
meta_key. BP's get_meta() functions were inconsistent in this regard: some
returned arrays of stdClass, some returned one-d arrays of meta_values. All
returned values that were practically of little use, because they didn't have
enough information about the located data to make it useful.

This changeset aligns BP's get_meta() functions with WP's. We now allow the
return value of get_metadata() to pass through untouched in all cases. Unit
tests have been updated as necessary.

See #5399

File:

• trunk/bp-activity/bp-activity-functions.php (modified) (2 diffs)

trunk/bp-activity/bp-activity-functions.php

@@ -580 +580 @@
         if ( empty( $meta_key ) ) {
                 $all_meta = bp_activity_get_meta( $activity_id );
-                $keys     = ! empty( $all_meta ) ? wp_list_pluck( $all_meta, 'meta_key' ) : array();
+                $keys     = ! empty( $all_meta ) ? array_keys( $all_meta ) : array();
 
                 // With no meta_key, ignore $delete_all
@@ -625 +625 @@
         $retval = get_metadata( 'activity', $activity_id, $meta_key, $single );
         remove_filter( 'query', 'bp_filter_metaid_column_name' );
-
-        // Legacy - If fetching all meta for a group, just return the first
-        // of each found value
-        if ( empty( $meta_key ) ) {
-                $values = array();
-                foreach ( (array) $retval as $rkey => $rvalue ) {
-                        $rvalue = array_reverse( $rvalue );
-                        $found = new stdClass;
-                        $found->meta_key = $rkey;
-                        $found->meta_value = array_pop( $rvalue );
-                        $values[] = $found;
-                }
-
-                // If nothing was found, return empty string
-                if ( empty( $values ) ) {
-                        $retval = '';
-                } else {
-                        $retval = $values;
-                }
-        }
 
         // Filter result before returning