Changeset 7997

Timestamp:

02/27/2014 07:48:22 PM (11 years ago)

Author:

r-a-y

Message:

Properly set object cache for a new BP_Activity_Activity object.

This commit also renames the activity cache key and group to be
consistent with the groups component. (See r7956.)

See #5434.

Location:

trunk/bp-activity

Files:

• bp-activity-cache.php (modified) (2 diffs)
• bp-activity-classes.php (modified) (3 diffs)

trunk/bp-activity/bp-activity-cache.php

@@ -43 +43 @@
  */
 function bp_activity_clear_cache_for_activity( $activity ) {
-    wp_cache_delete( 'activity_' . $activity->id, 'bp' );
+    wp_cache_delete( $activity->id, 'bp_activity' );
 }
 add_action( 'bp_activity_after_save', 'bp_activity_clear_cache_for_activity' );
@@ -56 +56 @@
 function bp_activity_clear_cache_for_deleted_activity( $deleted_ids ) {
     foreach ( (array) $deleted_ids as $deleted_id ) {
-        wp_cache_delete( 'activity_' . $deleted_id, 'bp' );
+        wp_cache_delete( $deleted_id, 'bp_activity' );
     }
 }

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

@@ -138 +138 @@
         global $wpdb, $bp;
 
-        $row = wp_cache_get( 'activity_' . $this->id, 'bp' );
+        $row = wp_cache_get( $this->id, 'bp_activity' );
 
         if ( false === $row ) {
             $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id = %d", $this->id ) );
+
+            wp_cache_set( $this->id, $row, 'bp_activity' );
         }
 
@@ -475 +477 @@
 
             // If cached data is found, use it
-            if ( $activity_data = wp_cache_get( 'activity_' . $activity_id, 'bp' ) ) {
+            if ( $activity_data = wp_cache_get( $activity_id, 'bp_activity' ) ) {
                 $activities[ $activity_id ] = $activity_data;
 
@@ -499 +501 @@
             foreach ( (array) $queried_adata as $adata ) {
                 $activities[ $adata->id ] = $adata;
-                wp_cache_set( 'activity_' . $adata->id, $adata, 'bp' );
+                wp_cache_set( $adata->id, $adata, 'bp_activity' );
             }
         }