Changeset 7131 for trunk/bp-core/bp-core-template-loader.php

Timestamp:

05/30/2013 10:58:46 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Iterate on theme compatibility content replacement order. Introduce bp_do_theme_compat() and other helper functions to avoid breaking on nested calls to the_content() or nested usages of 'the_content' filter.

Also, experiment with not adding/removing all_filters from 'the_content' for a bit, and see if any issues come up in testing with other plugins active.

See #5021.

File:

• trunk/bp-core/bp-core-template-loader.php (modified) (2 diffs)

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

@@ -212 +212 @@
 
     // Get the output buffer contents
-    $output = ob_get_contents();
-
-    // Flush the output buffer
-    ob_end_clean();
+    $output = ob_get_clean();
 
     // Echo or return the output buffer contents
@@ -342 +339 @@
     $new_template = apply_filters( 'bp_get_root_template', false, $template );
 
-    // BuddyPress template file exists
+    // A BuddyPress template file was located, so override the WordPress
+    // template and use it to switch off BuddyPress's theme compatibility.
     if ( !empty( $new_template ) ) {
-
-        // Override the WordPress template with a BuddyPress one
-        $template = $new_template;
-
-        // @see: bp_template_include_theme_compat()
-        buddypress()->theme_compat->found_template = true;
+        $template = bbp_set_template_included( $new_template );
     }
 
     return apply_filters( 'bp_template_include_theme_supports', $template );
+}
+
+/**
+ * Set the included template
+ *
+ * @since BuddyPress (1.8)
+ * @param mixed $template Default false
+ * @return mixed False if empty. Template name if template included
+ */
+function bp_set_template_included( $template = false ) {
+    buddypress()->theme_compat->found_template = $template;
+
+    return buddypress()->theme_compat->found_template;
+}
+
+/**
+ * Is a BuddyPress template being included?
+ *
+ * @since BuddyPress (1.8)
+ * @return bool True if yes, false if no
+ */
+function bp_is_template_included() {
+    return ! empty( buddypress()->theme_compat->found_template );
 }