Ticket #4599: jjj.patch

bp-core/bp-core-catchuri.php

@@ -342 +342 @@
  * @return false|int The user ID of the matched user, or false.
  */
 function bp_core_load_template( $templates ) {
-        global $post, $bp, $wp_query, $wpdb;
+        global $wpdb;
 
+        // Get BuddyPress instance
+        $bp = buddypress();
+
         // Determine if the root object WP page exists for this request
         // note: get_page_by_path() breaks non-root pages
-        if ( !empty( $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] ) ) ) {
+        if ( !empty( $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;
-                }
-        }
 
-        // Set the root object as the current wp_query-ied item
-        $object_id = 0;
-        foreach ( (array) $bp->pages as $page ) {
-                if ( $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
         $filtered_templates = array();
-        foreach ( (array) $templates as $template ) {
+        foreach ( (array) $templates as $template )
                 $filtered_templates[] = $template . '.php';
-        }
 
         // Filter the template locations so that plugins can alter where they are located
         $located_template = apply_filters( 'bp_located_template', locate_template( (array) $filtered_templates, false ), $filtered_templates );
         if ( !empty( $located_template ) ) {
 
-                // 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_singular = true;
-                $wp_query->is_404      = false;                 
+                _bp_core_force_queried_object();
 
                 do_action( 'bp_core_pre_load_template', $located_template );
 
@@ -399 +380 @@
                 // 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;                 
+                        _bp_core_force_queried_object();
                 }
 
                 do_action( 'bp_setup_theme_compat' );
@@ -410 +388 @@
 }
 
 /**
+ * A private function to overload the queried object when BuddyPress is
+ * overloading WordPress's template loader.
+ *
+ * Do not use this in your plugins or themes.
+ *
+ * @since BuddyPress (1.7)
+ * @global WP_Post $post
+ * @global WP_Query $wp_query
+ */
+function _bp_core_force_queried_object() {
+        global $post, $wp_query;
+
+        // Get BuddyPress instance
+        $bp = buddypress();
+
+        // Set the root object as the current wp_query-ied item
+        $object_id = 0;
+        foreach ( (array) $bp->pages as $page )
+                if ( $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;
+        }
+
+        // Reset $wp_query globals
+        $wp_query->is_page     = true;
+        $wp_query->is_singular = true;
+        $wp_query->is_home     = false;
+        $wp_query->is_404      = false;
+
+        // We know we've found a template
+        status_header( 200 );
+}
+
+/**
  * bp_core_catch_profile_uri()
  *
  * If the extended profiles component is not installed we still need