Changeset 2972

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

Location:

branches/plugin

Files:

• bbp-includes/bbp-forum-template.php (modified) (1 diff)
• bbp-includes/bbp-reply-template.php (modified) (2 diffs)
• bbp-includes/bbp-topic-template.php (modified) (3 diffs)
• bbpress.php (modified) (1 diff)

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

@@ -140 +140 @@
         // Easy empty checking
         if ( !empty( $forum_id ) && is_numeric( $forum_id ) )
-            $bbp_forum_id = $forum_id;
+            $bbp_forum_id = $bbp->current_forum_id = $forum_id;
 
         // Currently inside a forum loop
         elseif ( !empty( $bbp->forum_query->in_the_loop ) && isset( $bbp->forum_query->post->ID ) )
-            $bbp_forum_id = $bbp->forum_query->post->ID;
+            $bbp_forum_id = $bbp->current_forum_id = $bbp->forum_query->post->ID;
 
         // Currently viewing a forum
         elseif ( bbp_is_forum() && isset( $wp_query->post->ID ) )
-            $bbp_forum_id = $wp_query->post->ID;
+            $bbp_forum_id = $bbp->current_forum_id = $wp_query->post->ID;
 
         // Currently viewing a topic
         elseif ( bbp_is_topic() )
-            $bbp_forum_id = bbp_get_topic_forum_id();
+            $bbp_forum_id = $bbp->current_forum_id = bbp_get_topic_forum_id();
 
         // Fallback
         else
             $bbp_forum_id = 0;
-
-        // Set global
-        $bbp->current_forum_id = $bbp_forum_id;
 
         return apply_filters( 'bbp_get_forum_id', (int) $bbp_forum_id, $forum_id );

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 );

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 );

branches/plugin/bbpress.php

@@ -146 +146 @@
      * @var string Current forum id
      */
-    var $current_forum_id;
+    var $current_forum_id = null;
 
     /**
      * @var string Current topic id
      */
-    var $current_topic_id;
+    var $current_topic_id = null;
 
     /**
      * @var string Current reply id
      */
-    var $current_reply_id;
+    var $current_reply_id = null;
 
     /** User ******************************************************************/