Changeset 3583 for trunk/bp-core/bp-core-catchuri.php

Timestamp:

12/25/2010 06:01:57 PM (14 years ago)

Author:

djpaul

Message:

Don't send 404 headers on good pages; reverts parts of r3488. Fixes #2969

File:

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

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

@@ -106 +106 @@
     // Reset the keys by merging with an empty array
     $bp_uri            = array_merge( array(), $bp_uri );
-    $bp_unfiltered_uri = $bp_uri;
 
     // If a component is set to the front page, force its name into $bp_uri so that $current_component is populated
@@ -114 +113 @@
             $bp_uri[0] = $post->post_name;
     }
+
+    $bp_unfiltered_uri = $bp_uri;
 
     // Find a match within registered BuddyPress controlled WP pages (check members first)
@@ -229 +230 @@
  */
 function bp_core_load_template( $templates ) {
-    global $bp, $wpdb, $wp_query, $bp_unfiltered_uri, $bp_unfiltered_uri_offset;
+    global $post, $bp, $wpdb, $wp_query, $bp_unfiltered_uri, $bp_unfiltered_uri_offset;
 
     // Determine if the root object WP page exists for this request (TODO: is there an API function for this?
-    if ( !empty( $bp_unfiltered_uri[$bp_unfiltered_uri_offset] ) )
-        if ( !$page_exists = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_name = %s", $bp_unfiltered_uri[$bp_unfiltered_uri_offset] ) ) )
-            return false;
+    if ( !$page_exists = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_name = %s", $bp_unfiltered_uri[$bp_unfiltered_uri_offset] ) ) )
+        return false;
+
+    // Set the root object as the current wp_query-ied item
+    $object_id = 0;
+    foreach ( (array)$bp->pages as $page ) {
+        if ( isset( $bp_unfiltered_uri[$bp_unfiltered_uri_offset] ) && $page->name == $bp_unfiltered_uri[$bp_unfiltered_uri_offset] )
+            $object_id = $page->id;
+    }
+
+    // Make the queried/post object an actual valid page
+    if ( !empty( $object_id ) ) {
+        $wp_query->queried_object = &get_post( $object_id );
+        $wp_query->queried_object_id = $object_id;
+
+        $post = $wp_query->queried_object;
+    }
 
     // Fetch each template and add the php suffix
@@ -241 +256 @@
 
     // Filter the template locations so that plugins can alter where they are located
-    if ( $located_template = apply_filters( 'bp_located_template', locate_template( (array) $filtered_templates, false ), $filtered_templates ) )
+    if ( $located_template = apply_filters( 'bp_located_template', locate_template( (array) $filtered_templates, false ), $filtered_templates ) ) {
+        // Template was located, lets set this as a valid page and not a 404.
+        status_header( 200 );
+        $wp_query->is_page = true;
+        $wp_query->is_404 = false;
+
         load_template( apply_filters( 'bp_load_template', $located_template ) );
+    }
 
     // Kill any other output after this.