Changeset 7776

Timestamp:

02/04/2014 01:16:32 AM (11 years ago)

Author:

boonebgorges

Message:

Introduce BP_Activity_Activity::append_user_fullname()

Previously, the appending of xprofile fullnames was done inline in the get()
method. This changeset breaks it into a standalone method, so it can be used
elsewhere in the class.

See #5371

File:

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

trunk/bp-activity/bp-activity-classes.php

@@ -419 +419 @@
 
         // Get the fullnames of users so we don't have to query in the loop
-        if ( bp_is_active( 'xprofile' ) && !empty( $activities ) ) {
-            $activity_user_ids = wp_list_pluck( $activities, 'user_id' );
-            $activity_user_ids = implode( ',', wp_parse_id_list( $activity_user_ids ) );
-
-            if ( !empty( $activity_user_ids ) ) {
-                if ( $names = $wpdb->get_results( "SELECT user_id, value AS user_fullname FROM {$bp->profile->table_name_data} WHERE field_id = 1 AND user_id IN ({$activity_user_ids})" ) ) {
-
-                    foreach ( (array) $names as $name ) {
-                        $tmp_names[$name->user_id] = $name->user_fullname;
-                    }
-
-                    foreach ( (array) $activities as $i => $activity ) {
-                        if ( !empty( $tmp_names[$activity->user_id] ) ) {
-                            $activities[$i]->user_fullname = $tmp_names[$activity->user_id];
-                        }
-                    }
-
-                    unset( $names );
-                    unset( $tmp_names );
-                }
-            }
-        }
+        $activities = self::append_user_fullnames( $activities );
 
         // Get activity meta
@@ -536 +515 @@
                 $activities[ $a_index ]->user_login    = $a_user->user_login;
                 $activities[ $a_index ]->display_name  = $a_user->display_name;
+            }
+        }
+
+        return $activities;
+    }
+
+    /**
+     * Append xProfile fullnames to an activity array.
+     *
+     * @since BuddyPress (2.0.0)
+     *
+     * @param array $activities Activities array.
+     * @return array
+     */
+    protected function append_user_fullnames( $activities ) {
+        global $wpdb;
+
+        if ( bp_is_active( 'xprofile' ) && ! empty( $activities ) ) {
+            $activity_user_ids = wp_list_pluck( $activities, 'user_id' );
+            $activity_user_ids = implode( ',', wp_parse_id_list( $activity_user_ids ) );
+
+            if ( ! empty( $activity_user_ids ) ) {
+                $bp = buddypress();
+
+                if ( $names = $wpdb->get_results( "SELECT user_id, value AS user_fullname FROM {$bp->profile->table_name_data} WHERE field_id = 1 AND user_id IN ({$activity_user_ids})" ) ) {
+
+                    $tmp_names = array();
+
+                    foreach ( (array) $names as $name ) {
+                        $tmp_names[ $name->user_id ] = $name->user_fullname;
+                    }
+
+                    foreach ( (array) $activities as $i => $activity ) {
+                        if ( ! empty( $tmp_names[ $activity->user_id ] ) ) {
+                            $activities[ $i ]->user_fullname = $tmp_names[ $activity->user_id ];
+                        }
+                    }
+
+                    unset( $names );
+                    unset( $tmp_names );
+                }
             }
         }