Ticket #5021: 5021.3.patch

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

@@ -396 +396 @@
         );
         return bp_get_query_template( 'buddypress', $templates );
 }
+
+/**
+ * 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_end()
+ */
+function bp_theme_compat_main_loop_start() {
+
+        // Bail if not the main query
+        if ( ! in_the_loop() )
+                return;
+
+        // Remove all of the filters from the_content
+        bp_remove_all_filters( 'the_content' );
+
+        // Make sure we replace the content
+        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' );
+}

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

@@ -521 +521 @@
          */
         if ( bp_is_theme_compat_active() ) {
 
-                // Remove all filters from the_content
-                bp_remove_all_filters( 'the_content' );
+                // Remove all 'the_content' filters at the beginning of the post loop
+                add_action( 'loop_start', 'bp_theme_compat_main_loop_start',  9999 );
 
-                // Add a filter on the_content late, which we will later remove
-                if ( ! has_filter( 'the_content', 'bp_replace_the_content' ) ) {
-                        add_filter( 'the_content', 'bp_replace_the_content' );
-                }
+                // Restore all 'the_content' filters after the post loop is finished
+                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' ) ) {