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

Timestamp:

03/22/2010 12:28:41 PM (15 years ago)

Author:

apeatling

Message:

Make sure that we have a valid $post object on all BP pages.

File:

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

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

@@ -147 +147 @@
 
             /* Remove everything from the URI up to the offset and take it from there. */
-            for ( $i = 0; $i < $uri_offset; $i++ ) {
+            for ( $i = 0; $i < $uri_offset; $i++ )
                 unset( $bp_uri[$i] );
-            }
 
             $current_component = $bp_uri[$uri_offset];
@@ -209 +208 @@
  */
 function bp_core_load_template( $templates ) {
-    global $bp, $wpdb, $wp_query, $bp_unfiltered_uri, $bp_unfiltered_uri_offset;
-
-    /* Determine if the root object WP page exists for this request (is there an API function for this?)*/
+    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 ( !$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;
@@ -221 +220 @@
     }
 
-    $wp_query->queried_object = &get_post( $object_id );
-    $wp_query->queried_object_id = $object_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 */