Ticket #2495: 2495.diff

includes/extend/buddypress/notifications.php

@@ -89 +89 @@
         $component_name   = 'forums';
         $component_action = 'bbp_new_reply';
 
+        $args = array(
+                'user_id'           => $topic_author_id,
+                'item_id'           => $item_id,
+                'component_name'    => $component_name,
+                'component_action'  => $component_action,
+                'date_notified'     => $date_notified,
+        );
+
         // Notify the topic author if not the current reply author
         if ( $author_id !== $topic_author_id ) {
-                bp_core_add_notification( $item_id, $topic_author_id, $component_name, $component_action, $secondary_item_id, $date_notified );
+                $args['secondary_item_id'] = $secondary_item_id ;
+
+                bp_notifications_add_notification( $args );
         }
 
         // Notify the immediate reply author if not the current reply author
         if ( !empty( $reply_to ) && ( $author_id !== $reply_to_item_id ) ) {
-                bp_core_add_notification( $item_id, $topic_author_id, $component_name, $component_action, $reply_to_item_id, $date_notified );
+                $args['secondary_item_id'] = $reply_to_item_id ;
+
+                bp_notifications_add_notification( $args );
         }
 }
 add_action( 'bbp_new_reply', 'bbp_buddypress_add_notification', 10, 7 );
@@ -137 +149 @@
         if ( ! bbp_has_errors() ) {
 
                 // Attempt to clear notifications for the current user from this topic
-                $success = bp_core_mark_notifications_by_item_id( $user_id, $topic_id, 'forums', 'bbp_new_reply' );
+                $success = bp_notifications_mark_notifications_by_item_id( $user_id, $topic_id, 'forums', 'bbp_new_reply' );                    
 
                 // Do additional subscriptions actions
                 do_action( 'bbp_notifications_handler', $success, $user_id, $topic_id, $action );

includes/extend/buddypress/loader.php

@@ -46 +46 @@
                 $this->setup_globals();
                 $this->setup_actions();
                 $this->fully_loaded();
+
+                buddypress()->active_components[$this->id] = '1';
         }
 
         /**