Changeset 6534 for trunk/src/includes/users/engagements.php

Timestamp:

06/12/2017 09:23:32 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Engagements: Revert part of r6525, and adjust some actions.

• Engagements will need to be "public only" for 2.6, and we can reconsider what private/hidden engagements look like later
• Make sure that engagements are saved before voice counts are done
• Use new is_public style wrapper function for topics & replies where appropriate
• Remove a few current_filter() checks that should no longer be necessary with current action hook implementation
• There may be more clean-up necessary here, but this is required to bring all unit-tests back to passing as they've been written, specifically things hooked to the bbp_insert_topic and bbp_insert_reply hooks

See #3068. Hat-tip netweb.

File:

• trunk/src/includes/users/engagements.php (modified) (3 diffs)

trunk/src/includes/users/engagements.php

@@ -196 +196 @@
     $topic_id = bbp_get_topic_id( $topic_id );
     $bbp_db   = bbp_db();
+    $statii   = "'" . implode( "', '", bbp_get_public_topic_statuses() ) . "'";
 
     // A cool UNION query!
@@ -201 +202 @@
 SELECT DISTINCT( post_author ) FROM (
     SELECT post_author FROM {$bbp_db->posts}
-        WHERE ( ID = %d AND post_type = %s )
+        WHERE ( ID = %d AND post_status IN ({$statii}) AND post_type = %s )
 UNION
     SELECT post_author FROM {$bbp_db->posts}
-        WHERE ( post_parent = %d AND post_type = %s )
+        WHERE ( post_parent = %d AND post_status = %s AND post_type = %s )
 ) as u1";
 
     // Prepare & get results
-    $query   = $bbp_db->prepare( $sql, $topic_id, bbp_get_topic_post_type(), $topic_id, bbp_get_reply_post_type() );
+    $query   = $bbp_db->prepare( $sql, $topic_id, bbp_get_topic_post_type(), $topic_id, bbp_get_public_status_id(), bbp_get_reply_post_type() );
     $results = $bbp_db->get_col( $query );
 
@@ -439 +440 @@
 function bbp_update_topic_engagements( $topic_id = 0 ) {
 
-    // Check post type
+    // Is a reply
     if ( bbp_is_reply( $topic_id ) ) {
+
+        // Bail if reply isn't published
+        if ( ! bbp_is_reply_published( $topic_id ) ) {
+            return;
+        }
+
         $author_id = bbp_get_reply_author_id( $topic_id );
         $topic_id  = bbp_get_reply_topic_id( $topic_id );
+
+    // Is a topic
     } elseif ( bbp_is_topic( $topic_id ) ) {
         $author_id = bbp_get_topic_author_id( $topic_id );
         $topic_id  = bbp_get_topic_id( $topic_id );
+
+    // Is unknown
     } else {
+        return;
+    }
+
+    // Bail if topic is not public
+    if ( ! bbp_is_topic_public( $topic_id ) ) {
         return;
     }