Changeset 11578 for trunk/src/bp-messages/bp-messages-template.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-template.php (modified) (11 diffs)

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

@@ -59 +59 @@
     // User ID
     // @todo displayed user for moderators that get this far?
-    $user_id = bp_loggedin_user_id();
+    $user_id = bp_displayed_user_id();
 
     // Search Terms.
@@ -305 +305 @@
          * @param int    $thread_id ID of the thread.
          */
-        return apply_filters( 'bp_get_message_thread_view_link', trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() . '/view/' . $thread_id ), $thread_id );
+        return apply_filters( 'bp_get_message_thread_view_link', trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/view/' . $thread_id ), $thread_id );
     }
 
@@ -330 +330 @@
          * @param string $value Text indicating action being executed.
          */
-        return apply_filters( 'bp_get_message_thread_delete_link', wp_nonce_url( trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() . '/delete/' . $messages_template->thread->thread_id ), 'messages_delete_thread' ) );
+        return apply_filters( 'bp_get_message_thread_delete_link', wp_nonce_url( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() . '/delete/' . $messages_template->thread->thread_id ), 'messages_delete_thread' ) );
     }
 
@@ -362 +362 @@
 
         // Base unread URL.
-        $url = trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() . '/unread' );
+        $url = trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() . '/unread' );
 
         // Add the args to the URL.
@@ -409 +409 @@
 
         // Base read URL.
-        $url = trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() . '/read' );
+        $url = trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() . '/read' );
 
         // Add the args to the URL.
@@ -697 +697 @@
 /**
  * Output the unread messages count for the current inbox.
- */
-function bp_total_unread_messages_count() {
-    echo bp_get_total_unread_messages_count();
+ *
+ * @since 2.6.x Added $user_id argument.
+ *
+ * @param int $user_id The user ID.
+ *
+ * @return int $unread_count Total inbox unread count for user.
+ */
+function bp_total_unread_messages_count( $user_id = 0 ) {
+    echo bp_get_total_unread_messages_count( $user_id );
 }
     /**
      * Get the unread messages count for the current inbox.
      *
-     * @return int
-     */
-    function bp_get_total_unread_messages_count() {
+     * @since 2.6.x Added $user_id argument.
+     *
+     * @param int $user_id The user ID.
+     *
+     * @return int $unread_count Total inbox unread count for user.
+     */
+    function bp_get_total_unread_messages_count( $user_id = 0 ) {
 
         /**
@@ -715 +725 @@
          * @param int $value Unread messages count for the current inbox.
          */
-        return apply_filters( 'bp_get_total_unread_messages_count', BP_Messages_Thread::get_inbox_count() );
+        return apply_filters( 'bp_get_total_unread_messages_count', BP_Messages_Thread::get_inbox_count( $user_id ) );
     }
 
@@ -825 +835 @@
          * @param string $value The form action.
          */
-        return apply_filters( 'bp_get_messages_form_action', trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() . '/' . bp_action_variable( 0 ) ) );
+        return apply_filters( 'bp_get_messages_form_action', trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() . '/' . bp_action_variable( 0 ) ) );
     }
 
@@ -1154 +1164 @@
          * @param string $value Text indicating action being executed.
          */
-        return apply_filters( 'bp_get_message_notice_delete_link', wp_nonce_url( bp_loggedin_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( bp_displayed_user_domain() . bp_get_messages_slug() . '/notices/delete/' . $messages_template->thread->id, 'messages_delete_thread' ) );
     }
 
@@ -1172 +1182 @@
 
         if ( 1 === (int) $messages_template->thread->is_active ) {
-            $link = wp_nonce_url( trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() . '/notices/deactivate/' . $messages_template->thread->id ), 'messages_deactivate_notice' );
+            $link = wp_nonce_url( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/notices/deactivate/' . $messages_template->thread->id ), 'messages_deactivate_notice' );
         } else {
-            $link = wp_nonce_url( trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() . '/notices/activate/' . $messages_template->thread->id ), 'messages_activate_notice' );
+            $link = wp_nonce_url( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/notices/activate/' . $messages_template->thread->id ), 'messages_activate_notice' );
         }
 
@@ -1925 +1935 @@
          * @param string $value Text indicating action being executed.
          */
-        return apply_filters( 'bp_get_message_thread_delete_link', wp_nonce_url( bp_loggedin_user_domain() . bp_get_messages_slug() . '/inbox/delete/' . bp_get_the_thread_id(), 'messages_delete_thread' ) );
+        return apply_filters( 'bp_get_message_thread_delete_link', wp_nonce_url( bp_displayed_user_domain() . bp_get_messages_slug() . '/inbox/delete/' . bp_get_the_thread_id(), 'messages_delete_thread' ) );
     }