Changeset 5043 for trunk/includes/common/shortcodes.php

Timestamp:

07/18/2013 10:27:16 AM (13 years ago)

Author:

johnjamesjacoby

Message:

New approach to content replacement for theme compatability. Rather than juggle the post global and post content around in two procedures, set post_content via bbp_theme_compat_reset_post().

This reduces some complexity, avoids nested shortcodes, and fixes shortcode and the_content filter conflicts. See #2343.

File:

• trunk/includes/common/shortcodes.php (modified) (2 diffs)

trunk/includes/common/shortcodes.php

@@ -156 +156 @@
         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();
@@ -173 +170 @@
     private function end() {
 
-        // Put output into usable variable
-        $output = ob_get_contents();
-
-        // Unset globals
-        $this->unset_globals();
-
-        // Flush the output buffer
-        ob_end_clean();
+        // Unset globals
+        $this->unset_globals();
 
         // 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;
+        // Return and flush the output buffer
+        return ob_get_clean();
     }