Changeset 11578 for trunk/src/bp-messages/bp-messages-actions.php

Timestamp:

06/06/2017 05:46:21 PM (7 years ago)

Author:

dcavins

Message:

Show displayed user's messages on messages screens.

When a site administrator visits another user’s messages, she is shown
her own messages because the display logic for messages refers to the
logged-in user rather than the displayed user. This changeset updates
the logic to allow the site admin to view and interact with another
user’s messages.

Fixes #7096.

File:

• trunk/src/bp-messages/bp-messages-actions.php (modified) (4 diffs)

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

@@ -248 +248 @@
     }
 
-    // Mark message read.
-    messages_mark_thread_read( $thread_id );
+    /*
+     * Mark message read, but only run on the logged-in user's profile.
+     * If an admin visits a thread, it shouldn't change the read status.
+     */
+    if ( bp_is_my_profile() ) {
+        messages_mark_thread_read( $thread_id );
+    }
 
     /**
@@ -320 +325 @@
 
     // Check access to the message and mark as read.
-    if ( messages_check_thread_access( $id ) ) {
+    if ( messages_check_thread_access( $id ) || bp_current_user_can( 'bp_moderate' ) ) {
         messages_mark_thread_read( $id );
         bp_core_add_message( __( 'Message marked as read.', 'buddypress' ) );
@@ -361 +366 @@
 
     // Check access to the message and mark unread.
-    if ( messages_check_thread_access( $id ) ) {
+    if ( messages_check_thread_access( $id ) || bp_current_user_can( 'bp_moderate' ) ) {
         messages_mark_thread_unread( $id );
         bp_core_add_message( __( 'Message marked unread.', 'buddypress' ) );
@@ -405 +410 @@
     // Make sure the user has access to all notifications before managing them.
     foreach ( $messages as $message ) {
-        if ( ! messages_check_thread_access( $message ) ) {
+        if ( ! messages_check_thread_access( $message ) && ! bp_current_user_can( 'bp_moderate' ) ) {
             bp_core_add_message( __( 'There was a problem managing your messages.', 'buddypress' ), 'error' );
             bp_core_redirect( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() . '/' );