Changeset 5163

Timestamp:

11/23/2013 09:45:06 AM (11 years ago)

Author:

johnjamesjacoby

Message:

Introduce current_view_id to bbPress class variables. Used when calling a topic view shortcode via bbp-single-view so subsequent calls to bbp_view_query are able to retrieve the $view_id via bbp_get_view_id() the same way bbp_get_topic_id() works. Fixes #2457.

Location:

trunk

Files:

• bbpress.php (modified) (1 diff)
• includes/common/shortcodes.php (modified) (2 diffs)
• includes/common/template.php (modified) (1 diff)

trunk/bbpress.php

@@ -244 +244 @@
         /** Queries ***********************************************************/
 
+        $this->current_view_id      = 0; // Current view id
         $this->current_forum_id     = 0; // Current forum id
         $this->current_topic_id     = 0; // Current topic id

trunk/includes/common/shortcodes.php

@@ -126 +126 @@
 
         // Unset global ID's
+        $bbp->current_view_id      = 0;
         $bbp->current_forum_id     = 0;
         $bbp->current_topic_id     = 0;
@@ -624 +625 @@
         $this->unset_globals();
 
+        // Set the current view ID
+        bbpress()->current_view_id = $view_id;
+
         // Load the view
         bbp_view_query( $view_id );

trunk/includes/common/template.php

@@ -1902 +1902 @@
         $bbp = bbpress();
 
-        $view = !empty( $view ) ? sanitize_title( $view ) : get_query_var( bbp_get_view_rewrite_id() );
-
-        if ( array_key_exists( $view, $bbp->views ) )
+        if ( !empty( $view ) ) {
+            $view = sanitize_title( $view );
+        } elseif ( ! empty( $bbp->current_view_id ) ) {
+            $view = $bbp->current_view_id;
+        } else {
+            $view = get_query_var( bbp_get_view_rewrite_id() );
+        }
+
+        if ( array_key_exists( $view, $bbp->views ) ) {
             return $view;
+        }
 
         return false;