Ticket #2566: jeffsayre_2566_button.patch

buddypress/bp-themes/bp-default/members/single/member-header.php

@@ -25 +25 @@
                                 <?php bp_add_friend_button() ?>
                         <?php endif; ?>
 
-                        <?php if ( is_user_logged_in() && !bp_is_my_profile() && function_exists( 'bp_send_public_message_link' ) ) : ?>
-                                <div class="generic-button" id="post-mention">
-                                        <a href="<?php bp_send_public_message_link() ?>" title="<?php _e( 'Mention this user in a new public message, this will send the user a notification to get their attention.', 'buddypress' ) ?>"><?php _e( 'Mention this User', 'buddypress' ) ?></a>
-                                </div>
+                        <?php if ( function_exists( 'bp_send_public_message_link' ) ) : ?>
+                                <?php bp_send_public_message_link() ?>
                         <?php endif; ?>
-
-                        <?php if ( is_user_logged_in() && !bp_is_my_profile() && function_exists( 'bp_send_private_message_link' ) ) : ?>
-                                <div class="generic-button" id="send-private-message">
-                                        <a href="<?php bp_send_private_message_link() ?>" title="<?php _e( 'Send a private message to this user.', 'buddypress' ) ?>"><?php _e( 'Send Private Message', 'buddypress' ) ?></a>
-                                </div>
+                        
+                        <?php if ( function_exists( 'bp_send_private_message_link' ) ) : ?>
+                                        <?php bp_send_private_message_link() ?>
                         <?php endif; ?>
                 </div><!-- #item-buttons -->
 

buddypress/bp-activity/bp-activity-templatetags.php

@@ -839 +839 @@
 }
         function bp_get_send_public_message_link() {
                 global $bp;
+                
+                if ( is_user_logged_in() && !bp_is_my_profile() ) {
+                        
+                        $button = '<div class="generic-button" id="post-mention">';
+                        
+                        $button .= '<a href="' . wp_nonce_url( $bp->loggedin_user->domain . $bp->activity->slug . '/?r=' . bp_core_get_username( $bp->displayed_user->user_id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) . '" title="' . __( 'Mention this user in a new public message, this will send the user a notification to get their attention.', 'buddypress' ) . '">' . __( 'Mention this User', 'buddypress' ) . '</a>';
 
-                return apply_filters( 'bp_get_send_public_message_link', $bp->loggedin_user->domain . $bp->activity->slug . '/?r=' . bp_core_get_username( $bp->displayed_user->user_id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) );
+                        $button .= '</div>';
+
+                        return apply_filters( 'bp_get_send_public_message_link', $button );
+                }
+                return;
         }
 
 function bp_activity_post_form_action() {

buddypress/bp-messages/bp-messages-templatetags.php

@@ -481 +481 @@
 }
         function bp_get_send_private_message_link() {
                 global $bp;
+                
+                if ( is_user_logged_in() && !bp_is_my_profile() ) {
+                
+                        $button = '<div class="generic-button" id="send-private-message">';
+                        
+                        $button .= '<a href="' . wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/compose/?r=' . bp_core_get_username( $bp->displayed_user->user_id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) . '" title="' . __( 'Send a private message to this user.', 'buddypress' ) . '">' . __( 'Send Private Message', 'buddypress' ) . '</a>';
 
-                return apply_filters( 'bp_get_send_public_message_link', $bp->loggedin_user->domain . $bp->messages->slug . '/compose/?r=' . bp_core_get_username( $bp->displayed_user->user_id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) );
+                        $button .= '</div>';
+
+                        return apply_filters( 'bp_get_send_private_message_link', $button );
+                }
+                return;
         }
 
 function bp_send_message_button() {