Changeset 6923 for trunk/src/includes/replies/template.php

Timestamp:

11/09/2019 05:35:42 AM (5 years ago)

Author:

johnjamesjacoby

Message:

Counts (meta-data): full audit of forum/topic/reply, public/non-public counts.

This commit is the result of a full count audit, exposing multiple inconsistencies and voids in relation to how public and non-public counts are (re)calculated.

For instance, hidden forum replies are not counted at all, until now. By introducing a new Repair tool, hidden forum reply counts are now counted.

In addition, there were multiple bugs with topic & reply moderation, where the act of approving or unapproving topics or replies would cause the numbers to be inaccurate, or where topics & replies being caught in moderation were still increasing public counts.

It was also possible to, as a Key Master, publicly reply to unapproved topics, which was a completely unanticipated side-effect of allowing Key Masters to do pretty much anything. Going forward, the default reply status is the topic status, but is still beholden to all existing moderation settings and user role capabilities. This results in a more sane user experience, and prevents the unusual circumstance of there being "0 topics and 30 replies" in public-facing forums.

Certain count increase/decrease actions have been reprioritized to avoid collisions and race conditions, proving once again that ya gotta get up to get down.

See #2838. Fixes #1799.

File:

• trunk/src/includes/replies/template.php (modified) (9 diffs)

trunk/src/includes/replies/template.php

@@ -436 +436 @@
 
         // Set needed variables
-        $reply_id   = bbp_get_reply_id      ( $reply_id );
-        $topic_id   = bbp_get_reply_topic_id( $reply_id );
+        $reply_id = bbp_get_reply_id( $reply_id );
+
+        // Juggle reply & topic IDs for unpretty URL formatting
+        if ( bbp_is_reply( $reply_id ) ) {
+            $topic_id = bbp_get_reply_topic_id( $reply_id );
+        } elseif ( bbp_is_topic( $reply_id ) ) {
+            $topic_id = bbp_get_topic_id( $reply_id );
+            $reply_id = $topic_id;
+        }
 
         // Hierarchical reply page
@@ -448 +455 @@
         }
 
+        // Get links & URLS
         $reply_hash = '#post-' . $reply_id;
         $topic_link = bbp_get_topic_permalink( $topic_id, $redirect_to );
         $topic_url  = remove_query_arg( 'view', $topic_link );
 
+        // Get vars needed to support pending topics with unpretty links
+        $has_slug   = bbp_get_topic( $topic_id )->post_name;
+        $pretty     = bbp_use_pretty_urls();
+        $published  = ! bbp_is_topic_pending( $topic_id );
+
         // Don't include pagination if on first page
         if ( 1 >= $reply_page ) {
-            $url = user_trailingslashit( $topic_url ) . $reply_hash;
+
+            // Pretty permalinks
+            if ( ! empty( $has_slug ) && ! empty( $pretty ) && ! empty( $published ) ) {
+                $url = user_trailingslashit( $topic_url ) . $reply_hash;
+
+            // Unpretty links
+            } else {
+                $url = $topic_url . $reply_hash;
+            }
 
         // Include pagination
@@ -460 +481 @@
 
             // Pretty permalinks
-            if ( bbp_use_pretty_urls() ) {
+            if ( ! empty( $has_slug ) && ! empty( $pretty ) && ! empty( $published ) ) {
                 $url = trailingslashit( $topic_url ) . trailingslashit( bbp_get_paged_slug() ) . $reply_page;
                 $url = user_trailingslashit( $url ) . $reply_hash;
 
-            // Yucky links
+            // Unpretty links
             } else {
                 $url = add_query_arg( 'paged', $reply_page, $topic_url ) . $reply_hash;
@@ -762 +783 @@
             $reply_id     = bbp_get_reply_id( $reply_id );
             $revision_log = get_post_meta( $reply_id, '_bbp_revision_log', true );
-            $revision_log = empty( $revision_log ) ? array() : $revision_log;
+            $revision_log = ! empty( $revision_log )
+                ? $revision_log
+                : array();
 
             // Filter & return
@@ -852 +875 @@
  *
  * @since 2.0.0 bbPress (r3496)
+ * @since 2.6.0 bbPress (r6922) Returns false if topic is also not published
  *
  * @param int $reply_id Optional. Topic id
@@ -858 +882 @@
 function bbp_is_reply_published( $reply_id = 0 ) {
     $reply_id     = bbp_get_reply_id( $reply_id );
+    $topic_id     = bbp_get_reply_topic_id( $reply_id );
     $status       = bbp_get_public_status_id();
-    $reply_status = bbp_get_reply_status( $reply_id ) === $status;
+    $topic_status = bbp_is_topic_published( $topic_id );
+    $reply_status = ( bbp_get_reply_status( $reply_id ) === $status );
+    $retval       = ( $reply_status && $topic_status );
 
     // Filter & return
-    return (bool) apply_filters( 'bbp_is_reply_published', (bool) $reply_status, $reply_id );
+    return (bool) apply_filters( 'bbp_is_reply_published', (bool) $retval, $reply_id );
 }
 
@@ -1396 +1423 @@
     function bbp_get_reply_topic_id( $reply_id = 0 ) {
         $reply_id = bbp_get_reply_id( $reply_id );
-        $topic_id = get_post_field( 'post_parent', $reply_id );
+        $topic_id = (int) get_post_field( 'post_parent', $reply_id );
 
         // Meta-data fallback
         if ( empty( $topic_id ) ) {
-            $topic_id = get_post_meta( $reply_id, '_bbp_topic_id', true );
+            $topic_id = (int) get_post_meta( $reply_id, '_bbp_topic_id', true );
         }
 
         // Filter
         if ( ! empty( $topic_id ) ) {
-            $topic_id = bbp_get_topic_id( $topic_id );
-        }
-
-        // Filter & return
-        return (int) apply_filters( 'bbp_get_reply_topic_id', (int) $topic_id, $reply_id );
+            $topic_id = (int) bbp_get_topic_id( $topic_id );
+        }
+
+        // Filter & return
+        return (int) apply_filters( 'bbp_get_reply_topic_id', $topic_id, $reply_id );
     }
 
@@ -1433 +1460 @@
     function bbp_get_reply_forum_id( $reply_id = 0 ) {
         $reply_id = bbp_get_reply_id( $reply_id );
-        $forum_id = get_post_field( 'post_parent', bbp_get_reply_topic_id( $reply_id ) );
+        $topic_id = bbp_get_reply_topic_id( $reply_id );
+        $forum_id = (int) get_post_field( 'post_parent', $topic_id );
 
         // Meta-data fallback
         if ( empty( $forum_id ) ) {
-            $forum_id = get_post_meta( $reply_id, '_bbp_forum_id', true );
+            $forum_id = (int) get_post_meta( $reply_id, '_bbp_forum_id', true );
         }
 
         // Filter
         if ( ! empty( $forum_id ) ) {
-            $forum_id = bbp_get_forum_id( $forum_id );
+            $forum_id = (int) bbp_get_forum_id( $forum_id );
         }
 
@@ -2272 +2300 @@
 
     // If pretty permalinks are enabled, make our pagination pretty
-    if ( bbp_use_pretty_urls() ) {
+    if ( bbp_use_pretty_urls() && ! bbp_is_topic_pending( $topic_id )) {
 
         // User's replies