Changeset 3167

Timestamp:

05/16/2011 08:02:09 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Add single view shortcode, and add single views to theme compatibility. Fix issue with theme compat where error could occur if output buffer content was somehow empty.

Location:

branches/plugin/bbp-includes

Files:

• bbp-core-shortcodes.php (modified) (2 diffs)
• bbp-general-template.php (modified) (3 diffs)

branches/plugin/bbp-includes/bbp-core-shortcodes.php

@@ -94 +94 @@
 
             // Reply form
-            'bbp-reply-form' => array( $this, 'display_reply_form'    )
+            'bbp-reply-form' => array( $this, 'display_reply_form'    ),
+
+            /** Views *********************************************************/
+
+            // Single view
+            'bbp-single-view' => array( $this, 'display_view'         )
+
         ) );
     }
@@ -595 +601 @@
         } else {
             bbp_get_template_part( 'bbpress/no', 'topics' );
+        }
+
+        // Return contents of output buffer
+        return $this->_ob_end();
+    }
+
+    /** Views *****************************************************************/
+
+    /**
+     * Display the contents of a specific view in an output buffer and return to
+     * ensure that post/page contents are displayed first.
+     *
+     * @since bbPress (r3031)
+     *
+     * @param array $attr
+     * @param string $content
+     * @uses bbp_has_topics()
+     * @uses current_theme_supports()
+     * @uses get_template_part()
+     * @uses bbp_single_forum_description()
+     * @return string
+     */
+    function display_view( $attr, $content = '' ) {
+        global $bbp;
+
+        // Sanity check required info
+        if ( empty( $attr['id'] ) )
+            return $content;
+
+        // Set passed attribute to $view_id for clarity
+        $view_id = $attr['id'];
+
+        // Start output buffer
+        $this->_ob_start();
+
+        // Display breadcrumb if a subforum
+        bbp_get_template_part( 'bbpress/nav', 'breadcrumb' );
+
+        // Password protected
+        if ( post_password_required() ) {
+
+            // Output the password form
+            bbp_get_template_part( 'bbpress/form', 'protected' );
+
+        // Not password protected, or password is already approved
+        } else {
+
+            /** Topics ********************************************************/
+
+            // Unset globals
+            $this->_unset_globals();
+
+            // Load the topic index
+            if ( bbp_view_query( $view_id ) ) {
+                bbp_get_template_part( 'bbpress/pagination', 'topics' );
+                bbp_get_template_part( 'bbpress/loop',       'topics' );
+                bbp_get_template_part( 'bbpress/pagination', 'topics' );
+                bbp_get_template_part( 'bbpress/form',       'topic'  );
+
+            // No topics
+            } else {
+                bbp_get_template_part( 'bbpress/no',   'topics' );
+                bbp_get_template_part( 'bbpress/form', 'topic'  );
+            }
         }
 

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

@@ -2061 +2061 @@
         global $bbp;
 
+        // Prevent debug notice
+        $new_content = '';
+
         // Remove the filter that was added in bbp_template_include()
         remove_filter( 'the_content', 'bbp_replace_the_content', 99999 );
@@ -2131 +2134 @@
 
         } elseif ( bbp_is_view() ) {
-
+            $new_content = $bbp->shortcodes->display_view( array( 'id' => get_query_var( 'bbp_view' ) ) );
 
         /** Topic Tags ********************************************************/
@@ -2163 +2166 @@
 
         // Juggle the content around and try to prevent unsightly comments
-        if ( $new_content != $content ) {
+        if ( !empty( $new_content ) && ( $new_content != $content ) ) {
 
             // Set the content to be the new content