Changeset 6290

Timestamp:

09/03/2012 01:03:01 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Theme Compatibility:

• Temporarily override 404 in bp_core_load_template() when a template cannot be found, but we can confirm we are in a BuddyPress component. This is a brute-force override that will be made more elegant later.
• See: #3741.

File:

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

trunk/bp-core/bp-core-catchuri.php

@@ -382 +382 @@
         // Template was located, lets set this as a valid page and not a 404.
         status_header( 200 );
-        $wp_query->is_page = $wp_query->is_singular = true;
-        $wp_query->is_404  = false;
+        $wp_query->is_page     = true;
+        $wp_query->is_singular = true;
+        $wp_query->is_404      = false;         
 
         do_action( 'bp_core_pre_load_template', $located_template );
@@ -397 +398 @@
     // @todo Some other 404 handling if theme compat doesn't kick in
     } else {
+
+        // We know where we are, so reset important $wp_query bits here early.
+        // The rest will be done by bp_theme_compat_reset_post() later.
+        if ( is_buddypress() ) {
+            status_header( 200 );
+            $wp_query->is_page     = true;
+            $wp_query->is_singular = true;
+            $wp_query->is_404      = false;         
+        }
+
         do_action( 'bp_setup_theme_compat' );
     }