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

trunk/src/includes/forums/template.php

@@ -664 +664 @@
         $parent_id = get_post_field( 'post_parent', $forum_id );
 
+        // Meta-data fallback
+        if ( empty( $parent_id ) ) {
+            $parent_id = get_post_meta( $forum_id, '_bbp_forum_id', true );
+        }
+
+        // Filter
+        if ( ! empty( $parent_id ) ) {
+            $parent_id = bbp_get_forum_id( $parent_id );
+        }
+
         // Filter & return
         return (int) apply_filters( 'bbp_get_forum_parent_id', (int) $parent_id, $forum_id );
@@ -2187 +2197 @@
         if ( ! empty( $last_active ) ) {
 
+            // Has replies
             if ( ! empty( $reply_count ) ) {
-
-                if ( bbp_is_forum_category( $forum_id ) ) {
-                    $retstr = sprintf( esc_html__( 'This category contains %1$s and %2$s, and was last updated by %3$s %4$s.', 'bbpress' ), $topic_text, $reply_text, $last_updated_by, $time_since );
-                } else {
-                    $retstr = sprintf( esc_html__( 'This forum contains %1$s and %2$s, and was last updated by %3$s %4$s.',    'bbpress' ), $topic_text, $reply_text, $last_updated_by, $time_since );
-                }
-
+                $retstr = bbp_is_forum_category( $forum_id )
+                    ? sprintf( esc_html__( 'This category has %1$s, %2$s, and was last updated %3$s by %4$s.', 'bbpress' ), $topic_text, $reply_text, $time_since, $last_updated_by )
+                    : sprintf( esc_html__( 'This forum has %1$s, %2$s, and was last updated %3$s by %4$s.',    'bbpress' ), $topic_text, $reply_text, $time_since, $last_updated_by );
+
+            // Only has topics
             } else {
-
-                if ( bbp_is_forum_category( $forum_id ) ) {
-                    $retstr = sprintf( esc_html__( 'This category contains %1$s, and was last updated by %2$s %3$s.', 'bbpress' ), $topic_text, $last_updated_by, $time_since );
-                } else {
-                    $retstr = sprintf( esc_html__( 'This forum contains %1$s, and was last updated by %2$s %3$s.',    'bbpress' ), $topic_text, $last_updated_by, $time_since );
-                }
+                $retstr = bbp_is_forum_category( $forum_id )
+                    ? sprintf( esc_html__( 'This category has %1$s, and was last updated %2$s by %3$s.', 'bbpress' ), $topic_text, $time_since, $last_updated_by )
+                    : sprintf( esc_html__( 'This forum has %1$s, and was last updated %2$s by %3$s.',    'bbpress' ), $topic_text, $time_since, $last_updated_by );
             }
 
-        // Forum has no last active data
+        // Forum has no last active data (but does have topics & replies)
+        } elseif ( ! empty( $reply_count ) ) {
+            $retstr = bbp_is_forum_category( $forum_id )
+                ? sprintf( esc_html__( 'This category has %1$s and %2$s.', 'bbpress' ), $topic_text, $reply_text )
+                : sprintf( esc_html__( 'This forum has %1$s and %2$s.',    'bbpress' ), $topic_text, $reply_text );
+
+        // Forum has no last active data or replies (but does have topics)
+        } elseif ( ! empty( $topic_count ) ) {
+            $retstr = bbp_is_forum_category( $forum_id )
+                ? sprintf( esc_html__( 'This category has %1$s.', 'bbpress' ), $topic_text )
+                : sprintf( esc_html__( 'This forum has %1$s.',    'bbpress' ), $topic_text );
+
+        // Forum is empty
         } else {
-
-            if ( ! empty( $reply_count ) ) {
-
-                if ( bbp_is_forum_category( $forum_id ) ) {
-                    $retstr = sprintf( esc_html__( 'This category contains %1$s and %2$s.', 'bbpress' ), $topic_text, $reply_text );
-                } else {
-                    $retstr = sprintf( esc_html__( 'This forum contains %1$s and %2$s.',    'bbpress' ), $topic_text, $reply_text );
-                }
-
-            } else {
-
-                if ( ! empty( $topic_count ) ) {
-
-                    if ( bbp_is_forum_category( $forum_id ) ) {
-                        $retstr = sprintf( esc_html__( 'This category contains %1$s.', 'bbpress' ), $topic_text );
-                    } else {
-                        $retstr = sprintf( esc_html__( 'This forum contains %1$s.',    'bbpress' ), $topic_text );
-                    }
-
-                } else {
-                    $retstr = esc_html__( 'This forum is empty.', 'bbpress' );
-                }
-            }
-        }
-
-        // Add feeds
-        //$feed_links = ( ! empty( $r['feed'] ) ) ? bbp_get_forum_topics_feed_link ( $forum_id ) . bbp_get_forum_replies_feed_link( $forum_id ) : '';
+            $retstr = esc_html__( 'This forum is empty.', 'bbpress' );
+        }
 
         // Add the 'view all' filter back