Changeset 1910

Timestamp:

09/21/2009 09:37:22 PM (17 years ago)

Author:

apeatling

Message:

Fixes #1048

Location:

trunk

Files:

• bp-wire/bp-wire-templatetags.php (modified) (1 diff)
• bp-xprofile.php (modified) (2 diffs)

trunk/bp-wire/bp-wire-templatetags.php

@@ -23 +23 @@
                 if ( $bp->current_component == $bp->wire->slug ) {
                         $this->table_name = $bp->profile->table_name_wire;
-                        
-                        // If the user is viewing their own wire, delete the notifications.
-                        if ( 'all-posts' == $bp->current_action && bp_is_home() )
-                                bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'xprofile', 'new_wire_post' );
-                        
                 } else
                         $this->table_name = $bp->{$bp->active_components[$component_slug]}->table_name_wire;

trunk/bp-xprofile.php

@@ -536 +536 @@
                 /* Record the notification for the reciever if it's not on their own wire */
                 if ( !bp_is_home() )
-                        bp_core_add_notification( $bp->loggedin_user->id, $bp->displayed_user->id, 'profile', 'new_wire_post' );        
+                        bp_core_add_notification( $bp->loggedin_user->id, $bp->displayed_user->id, $bp->profile->id, 'new_wire_post' ); 
                 
                 /* Record this on the poster's activity screen */
@@ -1096 +1096 @@
         global $bp;
         
-        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'profile', 'new_wire_post' );
+        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->profile->id, 'new_wire_post' );
 }
 add_action( 'bp_wire_screen_latest', 'xprofile_remove_screen_notifications' );