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

trunk/src/includes/topics/functions.php

@@ -2518 +2518 @@
 
         // If this is a new, unpublished, reply, update hidden count and bail.
-        if ( 'bbp_new_reply' === current_filter() && ! bbp_is_reply_published( $reply_id ) ) {
+        if ( ! bbp_is_reply_published( $reply_id ) ) {
             bbp_increase_topic_reply_count_hidden( $topic_id );
             return;
@@ -2664 +2664 @@
 
     // If the topic is public, update the forum topic counts.
-    if ( bbp_get_topic_status( $topic_id ) === bbp_get_public_status_id() ) {
+    if ( bbp_is_topic_public( $topic_id ) ) {
         bbp_increase_forum_topic_count( $forum_id );
 
@@ -2695 +2695 @@
 
     // If it's a reply, then get the parent (topic id)
-    if ( bbp_is_reply( $topic_id ) ) {
-        $topic_id = bbp_get_reply_topic_id( $topic_id );
-    } else {
-        $topic_id = bbp_get_topic_id( $topic_id );
-    }
-
+    $topic_id = bbp_is_reply( $topic_id )
+        ? bbp_get_reply_topic_id( $topic_id )
+        : bbp_get_topic_id( $topic_id );
+
+    // Forum ID fallback
     if ( empty( $forum_id ) ) {
         $forum_id = get_post_field( 'post_parent', $topic_id );
@@ -2753 +2752 @@
 
     // If it's a reply, then get the parent (topic id)
-    if ( bbp_is_reply( $topic_id ) ) {
-        $topic_id = bbp_get_reply_topic_id( $topic_id );
-    } else {
-        $topic_id = bbp_get_topic_id( $topic_id );
-    }
+    $topic_id = bbp_is_reply( $topic_id )
+        ? bbp_get_reply_topic_id( $topic_id )
+        : bbp_get_topic_id( $topic_id );
 
     // Get replies of topic if not passed
@@ -2797 +2794 @@
 
     // If it's a reply, then get the parent (topic id)
-    if ( bbp_is_reply( $topic_id ) ) {
-        $topic_id = bbp_get_reply_topic_id( $topic_id );
-    } else {
-        $topic_id = bbp_get_topic_id( $topic_id );
-    }
+    $topic_id = bbp_is_reply( $topic_id )
+        ? bbp_get_reply_topic_id( $topic_id )
+        : bbp_get_topic_id( $topic_id );
 
     // Get replies of topic
@@ -2841 +2836 @@
 
     // If it's a reply, then get the parent (topic id)
-    if ( bbp_is_reply( $topic_id ) ) {
-        $topic_id = bbp_get_reply_topic_id( $topic_id );
-    } else {
-        $topic_id = bbp_get_topic_id( $topic_id );
-    }
-
+    $topic_id = bbp_is_reply( $topic_id )
+        ? bbp_get_reply_topic_id( $topic_id )
+        : bbp_get_topic_id( $topic_id );
+
+    // Get last public active id if not passed
     if ( empty( $active_id ) ) {
         $active_id = bbp_get_public_child_last_id( $topic_id, bbp_get_reply_post_type() );
@@ -2886 +2880 @@
 
     // If it's a reply, then get the parent (topic id)
-    if ( bbp_is_reply( $topic_id ) ) {
-        $topic_id = bbp_get_reply_topic_id( $topic_id );
-    } else {
-        $topic_id = bbp_get_topic_id( $topic_id );
-    }
+    $topic_id = bbp_is_reply( $topic_id )
+        ? bbp_get_reply_topic_id( $topic_id )
+        : bbp_get_topic_id( $topic_id );
 
     // Check time and use current if empty
@@ -3019 +3011 @@
 
     // If it's a reply, then get the parent (topic id)
-    if ( bbp_is_reply( $topic_id ) ) {
-        $topic_id = bbp_get_reply_topic_id( $topic_id );
-    } elseif ( bbp_is_topic( $topic_id ) ) {
-        $topic_id = bbp_get_topic_id( $topic_id );
-    } else {
-        return;
-    }
+    $topic_id = bbp_is_reply( $topic_id )
+        ? bbp_get_reply_topic_id( $topic_id )
+        : bbp_get_topic_id( $topic_id );
 
     // Query the DB to get anonymous replies in this topic
@@ -3452 +3440 @@
 
 /**
- * Retreive tags to a topic from post meta before it's unmarked as spam so they.
+ * Retrieve tags to a topic from post meta before it's unmarked as spam so they.
  *
  * Usually you'll want to do this before the topic itself is unmarked as spam.