Changeset 9322 for trunk/src/bp-core/bp-core-catchuri.php

Timestamp:

01/09/2015 12:39:36 AM (11 years ago)

Author:

r-a-y

Message:

Properly highlight BuddyPress pages in a WordPress nav or page menu.

r8932 attempted to address how BuddyPress pages are highlighted in a
WordPress menu after the refactoring of bp_core_load_template() (see
r8821). r8932 resulted in declaring the BuddyPress parent page as the
current page even when it wasn't.

This commit removes this declaration and changes the highlighting method
to rely on the WP nav and page menu filters. This also fixes issues
with highlighting the BP parent page when the root profiles feature is
enabled (this previously did not work).

Fixes #5997.

File:

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

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

@@ -343 +343 @@
     global $wp_query;
 
-    // check if BP page belongs to, or is a child of, a BP directory page
-    $page_id = false;
-    foreach ( (array) buddypress()->pages as $page ) {
-        if ( $page->name == buddypress()->unfiltered_uri[buddypress()->unfiltered_uri_offset] ) {
-            $page_id = $page->id;
-            break;
-        }
-    }
-
-    // Set up reset post args
-    $reset_post_args = array(
+    // Reset the post
+    bp_theme_compat_reset_post( array(
+        'ID'          => 0,
         'is_404'      => true,
         'post_status' => 'publish',
-    );
-
-    // BP page exists - fill in the $wp_query->post object
-    //
-    // bp_theme_compat_reset_post() looks at the $wp_query->post object to fill in
-    // the post globals
-    if ( ! empty( $page_id ) ) {
-        $wp_query->post = get_post( $page_id );
-        $reset_post_args['ID'] = $page_id;
-    } else {
-        $reset_post_args['ID'] = 0;
-    }
-
-    // Reset the post
-    bp_theme_compat_reset_post( $reset_post_args );
+    ) );
 
     // Set theme compat to false since the reset post function automatically sets
@@ -394 +372 @@
     $located_template = apply_filters( 'bp_located_template', $template, $filtered_templates );
     if ( !empty( $located_template ) ) {
-
         // Template was located, lets set this as a valid page and not a 404.
         status_header( 200 );