Changeset 7486

Timestamp:

10/31/2013 11:09:49 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Update bp_get_send_public_message_link() to use bp_get_displayed_user_username() rather than bp_core_get_username(). Also add a bp_is_user() check so that false is properly returned when there is no displayed user, and removes $bp global touch.

Avoids possible debug notice if function is used out of context.

File:

• trunk/bp-activity/bp-activity-template.php (modified) (2 diffs)

trunk/bp-activity/bp-activity-template.php

@@ -2703 +2703 @@
      * @since BuddyPress (1.2)
      *
-     * @global object $bp BuddyPress global settings
+     * @uses is_user_logged_in()
      * @uses bp_is_my_profile()
-     * @uses is_user_logged_in()
+     * @uses bp_is_user()
      * @uses wp_nonce_url()
      * @uses bp_loggedin_user_domain()
@@ -2715 +2715 @@
      */
     function bp_get_send_public_message_link() {
-        global $bp;
-
-        if ( bp_is_my_profile() || !is_user_logged_in() )
+
+        if ( ! is_user_logged_in() || ! bp_is_user() || bp_is_my_profile() )
             return false;
 
-        return apply_filters( 'bp_get_send_public_message_link', wp_nonce_url( bp_get_activity_directory_permalink() . '?r=' . bp_core_get_username( bp_displayed_user_id(), bp_get_displayed_user_username(), $bp->displayed_user->userdata->user_login ) ) );
+        return apply_filters( 'bp_get_send_public_message_link', wp_nonce_url( bp_get_activity_directory_permalink() . '?r=' . bp_get_displayed_user_username() ) );
     }