Ticket #5021: 5021.06.patch

bp-core/bp-core-template-loader.php

@@ -207 +207 @@
 
         bp_get_template_part( $slug, $name );
 
-        // Remove 'bp_replace_the_content' filter to prevent infinite loops
-        add_filter( 'the_content', 'bp_replace_the_content' );
-
         // Get the output buffer contents
         $output = ob_get_contents();
 
         // Flush the output buffer
         ob_end_clean();
 
+        // Put all the filters back
+        bp_restore_all_filters( 'the_content' );
+
         // Echo or return the output buffer contents
         if ( true === $echo ) {
                 echo $output;

bp-core/bp-core-theme-compatibility.php

@@ -528 +528 @@
                 // from the_content as late as possible.
                 add_action( 'loop_start', 'bp_theme_compat_main_loop_start',  9999 );
 
-                // Hook to the end of the main post loop to restore all filters to
-                // the_content as early as possible.
-                add_action( 'loop_end',   'bp_theme_compat_main_loop_end',   -9999 );
-
                 // Add BuddyPress's head action to wp_head
                 if ( ! has_action( 'wp_head', 'bp_head' ) ) {
                         add_action( 'wp_head', 'bp_head' );
@@ -588 +584 @@
  */
 function bp_theme_compat_main_loop_start() {
 
+        global $wp_query;
+
+        // Bail if there is more than one post in this loop, our page injection means
+        // there is only one post in the loop
+        if ( $wp_query->post_count > 1 )
+                return;
+
+        // Prevent recursion
+        remove_action( 'loop_start', 'bp_theme_compat_main_loop_start', 9999 );
+
         // Bail if not the main query
         if ( ! in_the_loop() )
                 return;
@@ -599 +605 @@
         add_filter( 'the_content', 'bp_replace_the_content' );
 }
 
-/**
- * Helper function to conditionally toggle the_content filters in the main
- * query loop. Aids with theme compatibility.
- *
- * @since BuddyPress (1.8)
- * @internal Used only by theme compatibilty
- * @see bp_template_include_theme_compat()
- * @see bp_theme_compat_main_loop_start()
- */
-function bp_theme_compat_main_loop_end() {
-
-        // Bail if not the main query
-        if ( ! in_the_loop() )
-                return;
-
-        // Put all the filters back
-        bp_restore_all_filters( 'the_content' );
-}
-
 /** Filters *******************************************************************/
 
 /**