Changeset 4975 for trunk/includes/core/template-loader.php

Timestamp:

05/30/2013 06:26:19 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Theme Compatibility improvements:

• Introduce helper functions to set and check a located root template, to aid in turning off theme-compat.
• Introduce bbp_do_theme_compat() which checks if we're in the main loop, and the $post global has been primed with theme-compat dummy data.
• Use WP_Post in bbp_theme_compat_reset_post(), and clean up this function a bit.
• Set theme_compat active to false after bbp_replace_the_content() has started, to avoid recursing through nested 'the_content' filter usages.
• Refactor output buffering used in bbp_replace_the_content() to clean up shortcode usages.
• See #2343.

File:

• trunk/includes/core/template-loader.php (modified) (1 diff)

trunk/includes/core/template-loader.php

@@ -109 +109 @@
     endif;
 
-    // bbPress template file exists
+    // A bbPress template file was located, so override the WordPress template
+    // and use it to switch off bbPress's theme compatibility.
     if ( !empty( $new_template ) ) {
-
-        // Override the WordPress template with a bbPress one
-        $template = $new_template;
-
-        // @see: bbp_template_include_theme_compat()
-        bbpress()->theme_compat->bbpress_template = true;
+        $template = bbp_set_template_included( $new_template );
     }
 
     return apply_filters( 'bbp_template_include_theme_supports', $template );
+}
+
+/**
+ * Set the included template
+ *
+ * @since bbPress (r4975)
+ * @param mixed $template Default false
+ * @return mixed False if empty. Template name if template included
+ */
+function bbp_set_template_included( $template = false ) {
+    bbpress()->theme_compat->bbpress_template = $template;
+
+    return bbpress()->theme_compat->bbpress_template;
+}
+
+/**
+ * Is a bbPress template being included?
+ *
+ * @since bbPress (r4975)
+ * @return bool True if yes, false if no
+ */
+function bbp_is_template_included() {
+    return ! empty( bbpress()->theme_compat->bbpress_template );
 }