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

Timestamp:

06/12/2017 05:29:02 PM (7 years ago)

Author:

johnjamesjacoby

Message:

Hierarchy: Use post_parent when not empty, and fallback to meta-data.

This fixes a few weird inconsistencies with how deleting content works, because delete_ hooks fire after meta & terms have already been deleted from the database, deleted_ hooks fire after the post itself is deleted from the database, but the post object cache has not yet been cleaned (even though term & meta caches have.)

We also call a few functions like bbp_is_reply() on the deleted $postid, and even though the state of the object-cache should not be relied on, it has not been purged yet.

Relatedly, updates to forum & topic descriptions can more reliably identify their state, so this commit adjusts some logic there also.

File:

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

trunk/src/includes/replies/template.php

@@ -1571 +1571 @@
      */
     function bbp_get_reply_topic_id( $reply_id = 0 ) {
-
-        // Assume there is no topic id
-        $topic_id = 0;
-
-        // Check that reply_id is valid
         $reply_id = bbp_get_reply_id( $reply_id );
-        if ( ! empty( $reply_id ) ) {
+        $topic_id = 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 );
-            if ( ! empty( $topic_id ) ) {
-                $topic_id = bbp_get_topic_id( $topic_id );
-            }
-        }
-
-        // Filter & return
-        return (int) apply_filters( 'bbp_get_reply_topic_id', $topic_id, $reply_id );
+        }
+
+        // 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 );
     }
 
@@ -1612 +1612 @@
      */
     function bbp_get_reply_forum_id( $reply_id = 0 ) {
-
-        // Assume there is no forum
-        $forum_id = 0;
-
-        // Check that reply_id is valid
         $reply_id = bbp_get_reply_id( $reply_id );
-        if ( ! empty( $reply_id ) ) {
+        $forum_id = get_post_field( 'post_parent', bbp_get_reply_topic_id( $reply_id ) );
+
+        // Meta-data fallback
+        if ( empty( $forum_id ) ) {
             $forum_id = get_post_meta( $reply_id, '_bbp_forum_id', true );
-            if ( ! empty( $forum_id ) ) {
-                $forum_id = bbp_get_forum_id( $forum_id );
-            }
+        }
+
+        // Filter
+        if ( ! empty( $forum_id ) ) {
+            $forum_id = bbp_get_forum_id( $forum_id );
         }