Changeset 3942

Timestamp:

06/08/2012 10:18:22 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Theme Compatibility:

• Fix issues with 'the_content' and bbp_replace_the_content() causing infinite loops, duplicate filters, no filters, etc...
• Add 'the_content' adds/removes to BBP_Shortcode where needed.
• Remove unneeded calls to do_shortcode().
• Fixes #1844.

Location:

branches/plugin/bbp-includes

Files:

• bbp-core-shortcodes.php (modified) (2 diffs)
• bbp-theme-compatibility.php (modified) (3 diffs)

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

@@ -173 +173 @@
         bbp_set_query_name( $query_name );
 
+        // Remove 'bbp_replace_the_content' filter to prevent infinite loops
+        remove_filter( 'the_content', 'bbp_replace_the_content' );
+
         // Start output buffer
         ob_start();
@@ -198 +201 @@
         // Reset the query name
         bbp_reset_query_name();
+
+        // Add 'bbp_replace_the_content' filter back (@see $this::start())
+        add_filter( 'the_content', 'bbp_replace_the_content' );
 
         return $output;

branches/plugin/bbp-includes/bbp-theme-compatibility.php

@@ -607 +607 @@
     $new_content = '';
 
-    // Remove the filter that was added in bbp_template_include()
-    remove_filter( 'the_content', 'bbp_replace_the_content' );
-
     // Bail if shortcodes are unset somehow
     if ( !is_a( $bbp->shortcodes, 'BBP_Shortcodes' ) )
@@ -652 +649 @@
         if ( !empty( $page ) ) {
 
+            // Restore previously unset filters
+            bbp_restore_all_filters( 'the_content' );
+
+            // Remove 'bbp_replace_the_content' filter to prevent infinite loops
+            remove_filter( 'the_content', 'bbp_replace_the_content' );
+
             // Start output buffer
             ob_start();
 
-            // Restore previously unset filters
-            bbp_restore_all_filters( 'the_content' );
-
             // Grab the content of this page
-            $new_content = do_shortcode( apply_filters( 'the_content', get_post_field( 'post_content', $page->ID ) ) );
+            $new_content = apply_filters( 'the_content', $page->post_content );
 
             // Clean up the buffer
             ob_end_clean();
+
+            // Add 'bbp_replace_the_content' filter back (@see $this::start())
+            add_filter( 'the_content', 'bbp_replace_the_content' );
 
         // No page so show the archive
@@ -678 +681 @@
         if ( !empty( $page ) ) {
 
+            // Restore previously unset filters
+            bbp_restore_all_filters( 'the_content' );
+
+            // Remove 'bbp_replace_the_content' filter to prevent infinite loops
+            remove_filter( 'the_content', 'bbp_replace_the_content' );
+
             // Start output buffer
             ob_start();
 
-            // Restore previously unset filters
-            bbp_restore_all_filters( 'the_content' );
-
             // Grab the content of this page
-            $new_content = do_shortcode( apply_filters( 'the_content', get_post_field( 'post_content', $page->ID ) ) );
+            $new_content = apply_filters( 'the_content', $page->post_content );
 
             // Clean up the buffer
             ob_end_clean();
 
+            // Add 'bbp_replace_the_content' filter back (@see $this::start())
+            add_filter( 'the_content', 'bbp_replace_the_content' );
 
         // No page so show the archive