Changeset 2972 for branches/plugin/bbp-includes/bbp-reply-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-reply-template.php (modified) (2 diffs)

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

@@ -221 +221 @@
                 // Currently viewing a reply
                 elseif ( ( bbp_is_reply() || bbp_is_reply_edit() ) && isset( $wp_query->post->ID ) )
-                        $bbp_reply_id = $wp_query->post->ID;
+                        $bbp_reply_id = $bbp->current_reply_id = $wp_query->post->ID;
 
                 // Currently inside a replies loop
                 elseif ( isset( $bbp->reply_query->post->ID ) )
-                        $bbp_reply_id = $bbp->reply_query->post->ID;
+                        $bbp_reply_id = $bbp->current_reply_id = $bbp->reply_query->post->ID;
 
                 // Fallback
@@ -231 +231 @@
                         $bbp_reply_id = 0;
 
-                $bbp->current_reply_id = $bbp_reply_id;
+                // Check if current_reply_id is set, and check post_type if so
+                if ( !empty( $bbp->current_reply_id ) && ( bbp_get_reply_post_type() != get_post_field( 'post_type', $bbp_reply_id ) ) )
+                        $bbp->current_reply_id = null;
 
                 return apply_filters( 'bbp_get_reply_id', (int) $bbp_reply_id, $reply_id );