Changeset 6528 for trunk/src/includes/topics/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/topics/template.php (modified) (3 diffs)

trunk/src/includes/topics/template.php

@@ -1881 +1881 @@
     function bbp_get_topic_forum_id( $topic_id = 0 ) {
         $topic_id = bbp_get_topic_id( $topic_id );
-        $forum_id = get_post_meta( $topic_id, '_bbp_forum_id', true );
+        $forum_id = get_post_field( 'post_parent', $topic_id );
+
+        // Meta-data fallback
+        if ( empty( $forum_id ) ) {
+            $forum_id = get_post_meta( $topic_id, '_bbp_forum_id', true );
+        }
+
+        // Filter
+        if ( ! empty( $forum_id ) ) {
+            $forum_id = bbp_get_forum_id( $forum_id );
+        }
 
         // Filter & return
@@ -3676 +3686 @@
         $voice_count = sprintf( _n( '%s voice', '%s voices', $vc_int, 'bbpress' ), $voice_count );
 
-        // Topic has replies
-        $last_reply = bbp_get_topic_last_reply_id( $topic_id );
-        if ( ! empty( $last_reply ) ) {
-            $last_updated_by = bbp_get_author_link( array( 'post_id' => $last_reply, 'size' => $r['size'] ) );
-            $retstr          = sprintf( esc_html__( 'This topic contains %1$s, has %2$s, and was last updated by %3$s %4$s.', 'bbpress' ), $reply_count, $voice_count, $last_updated_by, $time_since );
+        // Topic has activity (could be from reply or topic author)
+        $last_active = bbp_get_topic_last_active_id( $topic_id );
+        if ( ! empty( $last_active ) ) {
+            $last_updated_by = bbp_get_author_link( array( 'post_id' => $last_active, 'size' => $r['size'] ) );
+            $retstr          = sprintf( esc_html__( 'This topic has %1$s, %2$s, and was last updated %3$s by %4$s.', 'bbpress' ), $reply_count, $voice_count, $time_since, $last_updated_by );
 
         // Topic has no replies
         } elseif ( ! empty( $voice_count ) && ! empty( $reply_count ) ) {
-            $retstr = sprintf( esc_html__( 'This topic contains %1$s and has %2$s.', 'bbpress' ), $voice_count, $reply_count );
+            $retstr = sprintf( esc_html__( 'This topic has %1$s and %2$s.', 'bbpress' ), $voice_count, $reply_count );
 
         // Topic has no replies and no voices
@@ -4112 +4122 @@
 
 /**
- * Allow topic rows to have adminstrative actions
+ * Allow topic rows to have administrative actions
  *
  * @since 2.1.0 bbPress (r3653)