Changeset 6616

Timestamp:

07/04/2017 05:43:05 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Subscriptions: Include closed status in subscription triggers.

This change allows activity in closed topics to trigger subscription emails. It also fully implements bbp_get_subscribers() completing the deprecation of topic/forum specific handlers.

Fixes #2729.

Location:

trunk/src/includes

Files:

• admin/metaboxes.php (modified) (2 diffs)
• common/functions.php (modified) (4 diffs)
• topics/functions.php (modified) (2 diffs)
• users/engagements.php (modified) (1 diff)

trunk/src/includes/admin/metaboxes.php

@@ -746 +746 @@
 
     // Get user IDs
-    $user_ids = bbp_get_topic_subscribers( $post->ID );
+    $user_ids = bbp_get_subscribers( $post->ID );
 
     // Output
@@ -782 +782 @@
 
     // Get user IDs
-    $user_ids = bbp_get_forum_subscribers( $post->ID );
+    $user_ids = bbp_get_subscribers( $post->ID );
 
     // Output

trunk/src/includes/common/functions.php

@@ -1040 +1040 @@
     /** Topic *****************************************************************/
 
-    // Bail if topic is not published
-    if ( ! bbp_is_topic_published( $topic_id ) ) {
+    // Bail if topic is not public (includes closed)
+    if ( ! bbp_is_topic_public( $topic_id ) ) {
         return false;
     }
@@ -1058 +1058 @@
 
     // Get topic subscribers and bail if empty
-    $user_ids = bbp_get_topic_subscribers( $topic_id, true );
+    $user_ids = bbp_get_subscribers( $topic_id );
 
     // Dedicated filter to manipulate user ID's to send emails to
@@ -1200 +1200 @@
     /** Topic *****************************************************************/
 
-    // Bail if topic is not published
-    if ( ! bbp_is_topic_published( $topic_id ) ) {
+    // Bail if topic is not public (includes closed)
+    if ( ! bbp_is_topic_public( $topic_id ) ) {
         return false;
     }
@@ -1211 +1211 @@
 
     // Get topic subscribers and bail if empty
-    $user_ids = bbp_get_forum_subscribers( $forum_id, true );
+    $user_ids = bbp_get_subscribers( $forum_id );
 
     // Dedicated filter to manipulate user ID's to send emails to

trunk/src/includes/topics/functions.php

@@ -1140 +1140 @@
 
     // Get subscribers from source topic
-    $subscribers = bbp_get_topic_subscribers( $source_topic->ID );
+    $subscribers = bbp_get_subscribers( $source_topic->ID );
 
     // Maybe migrate subscriptions
@@ -1466 +1466 @@
 
         // Get the subscribers
-        $subscribers = bbp_get_topic_subscribers( $source_topic->ID );
+        $subscribers = bbp_get_subscribers( $source_topic->ID );
 
         if ( ! empty( $subscribers ) ) {

trunk/src/includes/users/engagements.php

@@ -657 +657 @@
 
     // Filter & return
-    return (array) apply_filters( 'bbp_get_forum_subscribers', $users, $object_id, $type );
+    return (array) apply_filters( 'bbp_get_subscribers', $users, $object_id, $type );
 }