Changeset 4240

Timestamp:

04/22/2011 09:09:23 PM (14 years ago)

Author:

djpaul

Message:

Fix subnav link and highlighting when viewing a private message. Fixes #3169

Location:

trunk

Files:

• bp-core/bp-core-buddybar.php (modified) (3 diffs)
• bp-messages/bp-messages-actions.php (modified) (2 diffs)

trunk/bp-core/bp-core-buddybar.php

@@ -171 +171 @@
         'site_admin_only' => false, // Can only site admins see this nav item?
         'position'        => 90,    // Index of where this nav item should be positioned
-        'screen_function' => false  // The name of the function to run when clicked
+        'screen_function' => false, // The name of the function to run when clicked
+        'link'            => ''     // The link for the subnav item; optional, not usually required.
     );
 
@@ -181 +182 @@
         return false;
 
+    if ( empty( $link ) )
+        $link = $parent_url . $slug;
+
     // If this is for site admins only and the user is not one, don't create the subnav item
     if ( $site_admin_only && !is_super_admin() )
@@ -190 +194 @@
     $bp->bp_options_nav[$parent_slug][$slug] = array(
         'name'            => $name,
-        'link'            => $parent_url . $slug . '/',
+        'link'            => trailingslashit( $link ),
         'slug'            => $slug,
         'css_id'          => $item_css_id,

trunk/bp-messages/bp-messages-actions.php

@@ -40 +40 @@
     do_action( 'messages_action_view_message' );
 
-    bp_core_new_subnav_item( array( 'name' => sprintf( __( 'From: %s', 'buddypress'), BP_Messages_Thread::get_last_sender($thread_id) ), 'slug' => "view/{$thread_id}", 'parent_url' => $bp->loggedin_user->domain . $bp->messages->slug . '/', 'parent_slug' => $bp->messages->slug, 'screen_function' => true, 'position' => 40, 'user_has_access' => bp_is_my_profile() ) );
+    bp_core_new_subnav_item( array(
+        'name'            => sprintf( __( 'From: %s', 'buddypress' ), BP_Messages_Thread::get_last_sender( $thread_id ) ),
+        'slug'            => 'view',
+        'parent_url'      => $bp->loggedin_user->domain . $bp->messages->slug . '/',
+        'parent_slug'     => $bp->messages->slug,
+        'screen_function' => true,
+        'position'        => 40,
+        'user_has_access' => bp_is_my_profile(),
+        'link'            => $bp->loggedin_user->domain . $bp->messages->slug . '/view/' . (int) $thread_id
+    ) );
+
     bp_core_load_template( apply_filters( 'messages_template_view_message', 'members/single/home' ) );
 }
@@ -93 +103 @@
 }
 add_action( 'bp_actions', 'messages_action_bulk_delete' );
-
 ?>