Changeset 864

Timestamp:

01/18/2009 01:48:57 AM (18 years ago)

Author:

apeatling

Message:

Fixes #295

Location:

trunk

Files:

• bp-activity.php (modified) (4 diffs)
• bp-activity/bp-activity-classes.php (modified) (6 diffs)

trunk/bp-activity.php

@@ -3 +3 @@
 
 define ( 'BP_ACTIVITY_IS_INSTALLED', 1 );
-define ( 'BP_ACTIVITY_VERSION', '1.0b1' );
+define ( 'BP_ACTIVITY_VERSION', '1.0b1.1' );
 
 /* How long before activity items in streams are re-cached? */
@@ -38 +38 @@
                                 component_action varchar(75) NOT NULL,
                                 date_recorded datetime NOT NULL,
-                                is_private tinyint(1) NOT NULL,
+                                is_private tinyint(1) NOT NULL DEFAULT 0,
+                                no_sitewide_cache tinyint(1) NOT NULL DEFAULT 0,
                             KEY item_id (item_id),
                                 KEY user_id (user_id),
@@ -55 +56 @@
                                 date_cached datetime NOT NULL,
                                 date_recorded datetime NOT NULL,
-                                is_private tinyint(1) NOT NULL,
+                                is_private tinyint(1) NOT NULL DEFAULT 0,
                                 KEY date_cached (date_cached),
                                 KEY date_recorded (date_recorded),
@@ -240 +241 @@
                 $activity->date_recorded = $recorded_time;
                 $activity->is_private = $is_private;
-                
+
                 // We don't want to record this on the sitewide stream, otherwise we will get duplicates.
-                $activity->no_sitewide_recording = true;
+                $activity->no_sitewide_cache = true;
 
                 $secondary_user_save = $activity->save();

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

@@ -10 +10 @@
         var $component_action;
         var $date_recorded;
-        var $is_private;
-        
-        var $no_sitewide_recording = false;
+        var $is_private = false;
+        var $no_sitewide_cache = false;
         
         var $table_name;
@@ -41 +40 @@
                 $this->date_recorded = $activity->date_recorded;
                 $this->is_private = $activity->is_private;
+                $this->no_sitewide_cache = $activity->no_sitewide_cache;
         }
         
@@ -55 +55 @@
                 if ( !$this->exists() ) {
                         // Insert the new activity into the activity table.
-                        $activity = $wpdb->query( $wpdb->prepare( "INSERT INTO " . $this->table_name . " ( item_id, secondary_item_id, user_id, component_name, component_action, date_recorded, is_private ) VALUES ( %d, %d, %d, %s, %s, FROM_UNIXTIME(%d), %d )", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_recorded, $this->is_private ) );
+                        $activity = $wpdb->query( $wpdb->prepare( "INSERT INTO " . $this->table_name . " ( item_id, secondary_item_id, user_id, component_name, component_action, date_recorded, is_private, no_sitewide_cache ) VALUES ( %d, %d, %d, %s, %s, FROM_UNIXTIME(%d), %d, %d )", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_recorded, $this->is_private, $this->no_sitewide_cache ) );
 
                         // Fetch the formatted activity content so we can add it to the cache.
@@ -67 +67 @@
                 
                         // Add the cached version of the activity to the sitewide activity table.
-                        if ( !$this->no_sitewide_recording )
+                        if ( !$this->no_sitewide_cache )
                                 $sitewide_cached = $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp['activity']['table_name_sitewide'] . " ( user_id, item_id, secondary_item_id, content, primary_link, component_name, component_action, date_cached, date_recorded ) VALUES ( %d, %d, %d, %s, %s, %s, %s, FROM_UNIXTIME(%d), FROM_UNIXTIME(%d) )", $this->user_id, $this->item_id, $this->secondary_item_id, $activity_content['content'], $activity_content['primary_link'], $this->component_name, $this->component_action, time(), $this->date_recorded ) );
                         
@@ -168 +168 @@
                                                 $activities_formatted[$i]['component_action'] = $activities[$i]->component_action;
                                                 $activities_formatted[$i]['is_private'] = $activities[$i]->is_private;
+                                                $activities_formatted[$i]['no_sitewide_cache'] = $activities[$i]->no_sitewide_cache;
                                         }
                                 }
@@ -320 +321 @@
                         
                         // Add to the sitewide activity stream
-                        if ( !$activity_array[$i]['is_private'] )
+                        if ( !$activity_array[$i]['is_private'] && !$activity_array[$i]['no_sitewide_cache'] )
                                 $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp['activity']['table_name_sitewide'] . " ( user_id, content, item_id, secondary_item_id, primary_link, component_name, component_action, date_cached, date_recorded ) VALUES ( %d, %s, %d, %d, %s, %s, %s, FROM_UNIXTIME(%d), %s )", $user_id, $activity_array[$i]['content'], $activity_array[$i]['item_id'], $activity_array[$i]['secondary_item_id'], $activity_array[$i]['primary_link'], $activity_array[$i]['component_name'], $activity_array[$i]['component_action'], time(), $activity_array[$i]['date_recorded'] ) );
                 }