Changeset 2972 for branches/plugin/bbp-includes/bbp-topic-template.php

Timestamp:

04/01/2011 03:00:10 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Improve logic behind setting the current_forum/topic/reply_id global variables

File:

• branches/plugin/bbp-includes/bbp-topic-template.php (modified) (3 diffs)

branches/plugin/bbp-includes/bbp-topic-template.php

@@ -293 +293 @@
          */
         function bbp_get_topic_id( $topic_id = 0 ) {
-                global $bbp, $wp_query, $bbp;
+                global $bbp, $wp_query;
 
                 // Easy empty checking
@@ -305 +305 @@
                 // Currently viewing a topic
                 elseif ( ( bbp_is_topic() || bbp_is_topic_edit() ) && isset( $wp_query->post->ID ) )
-                        $bbp_topic_id = $wp_query->post->ID;
+                        $bbp_topic_id = $bbp->current_topic_id = $wp_query->post->ID;
+
+                // Currently viewing a topic
+                elseif ( bbp_is_reply() )
+                        $bbp_topic_id = $bbp->current_topic_id = bbp_get_reply_topic_id();
 
                 // Fallback
@@ -311 +315 @@
                         $bbp_topic_id = 0;
 
-                $bbp->current_topic_id = $bbp_topic_id;
+                // Check if current_reply_id is set, and check post_type if so
+                if ( !empty( $bbp->current_topic_id ) && ( bbp_get_topic_post_type() != get_post_field( 'post_type', $bbp_topic_id ) ) )
+                        $bbp->current_topic_id = null;
 
                 return apply_filters( 'bbp_get_topic_id', (int) $bbp_topic_id, $topic_id );