Changeset 6534 for trunk/src/includes/forums/functions.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/forums/functions.php (modified) (2 diffs)

trunk/src/includes/forums/functions.php

@@ -1205 +1205 @@
         $forum_id = bbp_get_topic_forum_id( $topic_id );
 
-        // If this is a new, unpublished, topic, increase hidden count and bail.
-        if ( 'bbp_new_topic' === current_filter() && ( ! bbp_is_topic_published( $topic_id ) && ! bbp_is_topic_closed( $topic_id ) ) ) {
+        // Bail if not public.
+        if ( ! bbp_is_topic_public( $topic_id ) ) {
             bbp_increase_forum_topic_count_hidden( $forum_id );
             return;
@@ -1419 +1419 @@
     // If it's a reply, get the forum id.
     if ( bbp_is_reply( $forum_id ) ) {
-        $reply_id = $forum_id;
-        $forum_id = bbp_get_reply_forum_id( $reply_id );
-
-        // Don't update if this is a new, unpublished, reply.
-        if ( 'bbp_new_reply' === current_filter() && ! bbp_is_reply_published( $reply_id ) ) {
-            return;
-        }
+        $forum_id = bbp_get_reply_forum_id( $forum_id );
     }