Changeset 8821

Timestamp:

08/13/2014 03:20:55 AM (11 years ago)

Author:

r-a-y

Message:

In bp_core_load_template(), reset post globals if we're on a non-directory page.

If we're on a non-directory page, we are faking a WordPress page, so we
must reset the WordPress post globals to avoid notices from appearing. The
reset is done with the bp_theme_compat_reset_post() function and notably
fixes notices when the root profiles feature is toggled.

Commit also removes an unnecessary database query to determine whether
we're on a BuddyPress directory page. WordPress should have already made
this determination before BuddyPress has reached this point in
bp_core_load_template().

Fixes #5241.

File:

• trunk/src/bp-core/bp-core-catchuri.php (modified) (1 diff)

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

@@ -341 +341 @@
  */
 function bp_core_load_template( $templates ) {
-    global $post, $bp, $wp_query, $wpdb;
-
-    // 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] ) ) ) {
-            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;
-        $wp_query->post              = $wp_query->queried_object;
-        $post                        = $wp_query->queried_object;
+    global $wp_query;
+
+    // reset post if not on a directory page
+    // if we're not on a directory page, this means we're faking a page and we
+    // need to reset the post to avoid notices
+    if ( ! bp_is_directory() ) {
+        bp_theme_compat_reset_post( array(
+            'ID'          => 0,
+            'is_404'      => true,
+            'post_status' => 'publish',
+        ) );
+
+        // need to set theme compat to false since the reset post function
+        // automatically sets theme compat to true
+        bp_set_theme_compat_active( false );
     }