Changeset 8075

Timestamp:

03/07/2014 01:32:01 AM (11 years ago)

Author:

boonebgorges

Message:

Normalize cache priming in BP_Activity_Activity::get_activity_data()

No need to reproduce logic in bp_get_non_cached_ids(). This brings the caching
strategy in line with other components.

See #5434

File:

• trunk/bp-activity/bp-activity-classes.php (modified) (1 diff)

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

@@ -471 +471 @@
         $bp = buddypress();
 
-        $activities = array();
-        $query_aids = array();
-
-        foreach ( $activity_ids as $activity_id ) {
-
-            // If cached data is found, use it
-            if ( $activity_data = wp_cache_get( $activity_id, 'bp_activity' ) ) {
-                $activities[ $activity_id ] = $activity_data;
-
-            // Otherwise leave a placeholder so we don't lose the order
-            } else {
-                $activities[ $activity_id ] = '';
-
-                // Add to the list to be queried
-                $query_aids[] = $activity_id;
-            }
-        }
-
-        // Fetch activity data from the DB if necessary
-        if ( ! empty( $query_aids ) ) {
+        $activities   = array();
+        $uncached_ids = bp_get_non_cached_ids( $activity_ids, 'bp_activity' );
+
+        // Prime caches as necessary
+        if ( ! empty( $uncached_ids ) ) {
             // Format the activity ID's for use in the query below
-            $query_aids_sql = implode( ',', wp_parse_id_list( $query_aids ) );
+            $uncached_ids_sql = implode( ',', wp_parse_id_list( $uncached_ids ) );
 
             // Fetch data from activity table, preserving order
-            $queried_adata = $wpdb->get_results( "SELECT * FROM {$bp->activity->table_name} WHERE id IN ({$query_aids_sql}) ORDER BY FIELD( id, {$query_aids_sql} )");
+            $queried_adata = $wpdb->get_results( "SELECT * FROM {$bp->activity->table_name} WHERE id IN ({$uncached_ids_sql})");
 
             // Put that data into the placeholders created earlier,
             // and add it to the cache
             foreach ( (array) $queried_adata as $adata ) {
-                $activities[ $adata->id ] = $adata;
                 wp_cache_set( $adata->id, $adata, 'bp_activity' );
             }
         }
 
-        // Reset indexes
-        $activities = array_values( $activities );
+        // Now fetch data from the cache
+        foreach ( $activity_ids as $activity_id ) {
+            $activities[] = wp_cache_get( $activity_id, 'bp_activity' );
+        }
 
         // Then fetch user data