Changeset 2331 for trunk/bp-activity/bp-activity-classes.php

Timestamp:

01/18/2010 11:50:33 AM (16 years ago)

Author:

apeatling

Message:

Restoring update support to activity items.

File:

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

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

@@ -48 +48 @@
                         return false;
 
-                /***
-                 * Before v1.1 of BuddyPress, activity content was calculated at a later point. This is no longer the
-                 * case, to to be backwards compatible we need to fetch content here to continue.
-                 */
-                if ( empty( $this->content ) || !$this->content ) {
-                        if ( function_exists( $bp->{$this->component_name}->format_activity_function ) ) {
-                                if ( !$fetched_content = call_user_func( $bp->{$this->component_name}->format_activity_function, $this->item_id, $this->user_id, $this->component_action, $this->secondary_item_id, $this->for_secondary_user ) )
-                                        return false;
-
-                                $this->content = $fetched_content['content'];
-                                $this->primary_link = $fetched_content['primary_link'];
-                        }
-                }
-
                 if ( !$this->primary_link )
                         $this->primary_link = $bp->loggedin_user->domain;
@@ -97 +83 @@
                 $activity_ids = $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE item_id = %s {$secondary_sql} AND component_name = %s {$component_action_sql} {$user_sql}", $item_id, $component_name ) );
 
+                error_log( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE item_id = %s {$secondary_sql} AND component_name = %s {$component_action_sql} {$user_sql}", $item_id, $component_name ) );
+
                 if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->activity->table_name} WHERE item_id = %s {$secondary_sql} AND component_name = %s {$component_action_sql} {$user_sql}", $item_id, $component_name ) ) )
                         return false;