Changeset 11643

Timestamp:

07/13/2017 07:10:44 PM (9 years ago)

Author:

boonebgorges

Message:

Ensure that links for managing sitewide notices are specific to logged-in user.

These links were incorrectly converted to the displayed user as
part of the work in [11578]. Notices are always relative to the
logged-in user, and can be displayed anywhere on a site - regardless
of the displayed user (or lack thereof).

See #7096.

File:

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

trunk/src/bp-messages/bp-messages-template.php

@@ -1164 +1164 @@
                  * @param string $value Text indicating action being executed.
                  */
-                return apply_filters( 'bp_get_message_notice_delete_link', wp_nonce_url( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/notices/delete/' . $messages_template->thread->id ), 'messages_delete_thread' ) );
+                return apply_filters( 'bp_get_message_notice_delete_link', wp_nonce_url( trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() . '/notices/delete/' . $messages_template->thread->id ), 'messages_delete_thread' ) );
         }
 
@@ -1182 +1182 @@
 
                 if ( 1 === (int) $messages_template->thread->is_active ) {
-                        $link = wp_nonce_url( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/notices/deactivate/' . $messages_template->thread->id ), 'messages_deactivate_notice' );
+                        $link = wp_nonce_url( trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() . '/notices/deactivate/' . $messages_template->thread->id ), 'messages_deactivate_notice' );
                 } else {
-                        $link = wp_nonce_url( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/notices/activate/' . $messages_template->thread->id ), 'messages_activate_notice' );
+                        $link = wp_nonce_url( trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() . '/notices/activate/' . $messages_template->thread->id ), 'messages_activate_notice' );
                 }