Changeset 4593 for trunk/includes/core/theme-compat.php

Timestamp:

12/20/2012 09:40:25 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Move root template check to below reset_post blocks. Fixes incorrect 404 and corrects header statuses when using root templates. See #1478.

File:

• trunk/includes/core/theme-compat.php (modified) (2 diffs)

trunk/includes/core/theme-compat.php

@@ -454 +454 @@
 function bbp_template_include_theme_compat( $template = '' ) {
 
-    // Bail if the template already matches a bbPress template. This includes
-    // archive-* and single-* WordPress post_type matches (allowing
-    // themes to use the expected format) as well as all bbPress-specific
-    // template files for users, topics, forums, etc...
-    if ( !empty( bbpress()->theme_compat->bbpress_template ) )
-        return $template;
-
     /** Users *************************************************************/
 
@@ -630 +623 @@
         ) );
     }
+
+    /**
+     * Bail if the template already matches a bbPress template. This includes
+     * archive-* and single-* WordPress post_type matches (allowing
+     * themes to use the expected format) as well as all bbPress-specific
+     * template files for users, topics, forums, etc...
+     *
+     * We do this after the above checks to prevent incorrect 404 body classes
+     * and header statuses.
+     *
+     * @see http://bbpress.trac.wordpress.org/ticket/1478/
+     */
+    if ( !empty( bbpress()->theme_compat->bbpress_template ) )
+        return $template;
 
     /**