Changeset 6658 for trunk/bp-core/bp-core-theme-compatibility.php

Timestamp:

12/25/2012 09:02:57 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Theme Compat:

• In bp_template_include_theme_compat(), move root template check beyond reset post ation, so post gets reset even if root template is found.
• See #4656.

File:

• trunk/bp-core/bp-core-theme-compatibility.php (modified) (2 diffs)

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

@@ -445 +445 @@
 function bp_template_include_theme_compat( $template = '' ) {
 
-        // Bail if the template already matches a BuddyPress template
-        if ( !empty( buddypress()->theme_compat->found_template ) )
-                return $template;
-
         /**
          * Use this action to execute code that will communicate to BuddyPress's
@@ -455 +451 @@
          */
         do_action( 'bp_template_include_reset_dummy_post_data' );
+
+        // Bail if the template already matches a BuddyPress template
+        if ( !empty( buddypress()->theme_compat->found_template ) )
+                return $template;
 
         /**