Changeset 5163 for trunk/includes/common/template.php

Timestamp:

11/23/2013 09:45:06 AM (13 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.

File:

• trunk/includes/common/template.php (modified) (1 diff)

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;