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

Timestamp:

03/08/2010 04:20:25 PM (16 years ago)

Author:

apeatling

Message:

Merge 1.2 branch with trunk

File:

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

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

@@ -199 +199 @@
         }
 
-        function get_id( $user_id, $component, $type, $item_id, $secondary_item_id, $action, $content ) {
+        function get_id( $user_id, $component, $type, $item_id, $secondary_item_id, $action, $content, $date_recorded ) {
                 global $bp, $wpdb;
 
@@ -224 +224 @@
                 if ( !empty( $content ) )
                         $where_args[] = $wpdb->prepare( "content = %s", $content );
+
+                if ( !empty( $date_recorded ) )
+                        $where_args[] = $wpdb->prepare( "date_recorded = %s", $date_recorded );
 
                 if ( !empty( $where_args ) )