Ticket #7096: 7096.2.diff

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

@@ -273 +273 @@
 /**
  * Output the permalink for a particular thread.
  *
+ * @since 2.9.0 Introduced `$user_id` parameter.
+ *
  * @param int $thread_id Optional. ID of the thread. Default: current thread
  *                       being iterated on in the loop.
+ * @param int $user_id   Optional. ID of the user relative to whom the link
+ *                       should be generated. Default: ID of logged-in user.
  */
-function bp_message_thread_view_link( $thread_id = 0 ) {
-        echo bp_get_message_thread_view_link( $thread_id );
+function bp_message_thread_view_link( $thread_id = 0, $user_id = null ) {
+        echo bp_get_message_thread_view_link( $thread_id, $user_id );
 }
         /**
          * Get the permalink of a particular thread.
          *
+         * @since 2.9.0 Introduced `$user_id` parameter.
+         *
          * @param int $thread_id Optional. ID of the thread. Default: current
          *                       thread being iterated on in the loop.
+         * @param int $user_id   Optional. ID of the user relative to whom the link
+         *                       should be generated. Default: ID of logged-in user.
          * @return string
          */
-        function bp_get_message_thread_view_link( $thread_id = 0 ) {
+        function bp_get_message_thread_view_link( $thread_id = 0, $user_id = null ) {
                 global $messages_template;
 
                 if ( empty( $messages_template ) && (int) $thread_id > 0 ) {
@@ -295 +303 @@
                         $thread_id = $messages_template->thread->thread_id;
                 }
 
+                if ( null === $user_id ) {
+                        $user_id = bp_loggedin_user_id();
+                }
+
+                $domain = bp_core_get_user_domain( $user_id );
+
                 /**
                  * Filters the permalink of a particular thread.
                  *
                  * @since 1.0.0
                  * @since 2.6.0 Added the `$thread_id` parameter.
+                 * @since 2.9.0 Added the `$user_id` parameter.
                  *
                  * @param string $value     Permalink of a particular thread.
                  * @param int    $thread_id ID of the thread.
                  */
-                return apply_filters( 'bp_get_message_thread_view_link', trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/view/' . $thread_id ), $thread_id );
+                return apply_filters( 'bp_get_message_thread_view_link', trailingslashit( $domain . bp_get_messages_slug() . '/view/' . $thread_id ), $thread_id, $user_id );
         }
 
 /**
  * Output the URL for deleting the current thread.
+ *
+ * @since 2.9.0 Introduced `$user_id` parameter.
+ *
+ * @param int $user_id Optional. ID of the user relative to whom the link
+ *                     should be generated. Default: ID of logged-in user.
  */
-function bp_message_thread_delete_link() {
-        echo esc_url( bp_get_message_thread_delete_link() );
+function bp_message_thread_delete_link( $user_id = null ) {
+        echo esc_url( bp_get_message_thread_delete_link( $user_id ) );
 }
         /**
          * Generate the URL for deleting the current thread.
          *
+         * @since 2.9.0 Introduced `$user_id` parameter.
+         *
+         * @param int $user_id Optional. ID of the user relative to whom the link
+         *                     should be generated. Default: ID of logged-in user.
          * @return string
          */
-        function bp_get_message_thread_delete_link() {
+        function bp_get_message_thread_delete_link( $user_id = null ) {
                 global $messages_template;
 
+                if ( null === $user_id ) {
+                        $user_id = bp_loggedin_user_id();
+                }
+
+                $domain = bp_core_get_user_domain( $user_id );
+
                 /**
                  * Filters the URL for deleting the current thread.
                  *
@@ -329 +359 @@
                  * @param string $value URL for deleting the current thread.
                  * @param string $value Text indicating action being executed.
                  */
-                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' ) );
+                return apply_filters( 'bp_get_message_thread_delete_link', wp_nonce_url( trailingslashit( $domain . bp_get_messages_slug() . '/' . bp_current_action() . '/delete/' . $messages_template->thread->thread_id ), 'messages_delete_thread' ) );
         }
 
 /**
@@ -338 +368 @@
  * Since this function directly outputs a URL, it is escaped.
  *
  * @since 2.2.0
+ * @since 2.9.0 Introduced `$user_id` parameter.
+ *
+ * @param int $user_id Optional. ID of the user relative to whom the link
+ *                     should be generated. Default: ID of logged-in user.
  */
-function bp_the_message_thread_mark_unread_url() {
-        echo esc_url( bp_get_the_message_thread_mark_unread_url() );
+function bp_the_message_thread_mark_unread_url( $user_id = null ) {
+        echo esc_url( bp_get_the_message_thread_mark_unread_url( $user_id ) );
 }
         /**
          * Return the URL used for marking a single message thread as unread.
          *
          * @since 2.2.0
+         * @since 2.9.0 Introduced `$user_id` parameter.
          *
+         * @param int $user_id Optional. ID of the user relative to whom the link
+         *                     should be generated. Default: ID of logged-in user.
          * @return string
          */
-        function bp_get_the_message_thread_mark_unread_url() {
+        function bp_get_the_message_thread_mark_unread_url( $user_id = null ) {
 
                 // Get the message ID.
                 $id = bp_get_message_thread_id();
@@ -360 +397 @@
                         'message_id' => $id
                 );
 
+                if ( null === $user_id ) {
+                        $user_id = bp_loggedin_user_id();
+                }
+
+                $domain = bp_core_get_user_domain( $user_id );
+
                 // Base unread URL.
-                $url = trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() . '/unread' );
+                $url = trailingslashit( $domain . bp_get_messages_slug() . '/' . bp_current_action() . '/unread' );
 
                 // Add the args to the URL.
                 $url = add_query_arg( $args, $url );
@@ -385 +428 @@
  * Since this function directly outputs a URL, it is escaped.
  *
  * @since 2.2.0
+ * @since 2.9.0 Introduced `$user_id` parameter.
+ *
+ * @param int $user_id Optional. ID of the user relative to whom the link
+ *                     should be generated. Default: ID of logged-in user.
  */
-function bp_the_message_thread_mark_read_url() {
-        echo esc_url( bp_get_the_message_thread_mark_read_url() );
+function bp_the_message_thread_mark_read_url( $user_id = null ) {
+        echo esc_url( bp_get_the_message_thread_mark_read_url( $user_id ) );
 }
         /**
          * Return the URL used for marking a single message thread as read.
          *
          * @since 2.2.0
+         * @since 2.9.0 Introduced `$user_id` parameter.
          *
+         * @param int $user_id Optional. ID of the user relative to whom the link
+         *                     should be generated. Default: ID of logged-in user.
          * @return string
          */
-        function bp_get_the_message_thread_mark_read_url() {
+        function bp_get_the_message_thread_mark_read_url( $user_id = null ) {
 
                 // Get the message ID.
                 $id = bp_get_message_thread_id();
@@ -407 +457 @@
                         'message_id' => $id
                 );
 
+                if ( null === $user_id ) {
+                        $user_id = bp_loggedin_user_id();
+                }
+
+                $domain = bp_core_get_user_domain( $user_id );
+
                 // Base read URL.
-                $url = trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/' . bp_current_action() . '/read' );
+                $url = trailingslashit( $domain . bp_get_messages_slug() . '/' . bp_current_action() . '/read' );
 
                 // Add the args to the URL.
                 $url = add_query_arg( $args, $url );

src/bp-templates/bp-legacy/buddypress/members/single/messages/messages-loop.php

@@ -115 +115 @@
                                                 <?php endif; ?>
 
                                                 <td class="thread-info">
-                                                        <p><a href="<?php bp_message_thread_view_link(); ?>" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( "View Message", 'buddypress' ); ?>" aria-label="<?php esc_attr_e( "View Message", 'buddypress' ); ?>"><?php bp_message_thread_subject(); ?></a></p>
+                                                        <p><a href="<?php bp_message_thread_view_link( bp_get_message_thread_id(), bp_displayed_user_id() ); ?>" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( "View Message", 'buddypress' ); ?>" aria-label="<?php esc_attr_e( "View Message", 'buddypress' ); ?>"><?php bp_message_thread_subject(); ?></a></p>
                                                         <p class="thread-excerpt"><?php bp_message_thread_excerpt(); ?></p>
                                                 </td>
 
@@ -139 +139 @@
 
                                                 <td class="thread-options">
                                                         <?php if ( bp_message_thread_has_unread() ) : ?>
-                                                                <a class="read" href="<?php bp_the_message_thread_mark_read_url();?>"><?php _e( 'Read', 'buddypress' ); ?></a>
+                                                                <a class="read" href="<?php bp_the_message_thread_mark_read_url( bp_displayed_user_id() );?>"><?php _e( 'Read', 'buddypress' ); ?></a>
                                                         <?php else : ?>
-                                                                <a class="unread" href="<?php bp_the_message_thread_mark_unread_url();?>"><?php _e( 'Unread', 'buddypress' ); ?></a>
+                                                                <a class="unread" href="<?php bp_the_message_thread_mark_unread_url( bp_displayed_user_id() );?>"><?php _e( 'Unread', 'buddypress' ); ?></a>
                                                         <?php endif; ?>
                                                          |
-                                                        <a class="delete" href="<?php bp_message_thread_delete_link(); ?>"><?php _e( 'Delete', 'buddypress' ); ?></a>
+                                                        <a class="delete" href="<?php bp_message_thread_delete_link( bp_displayed_user_id() ); ?>"><?php _e( 'Delete', 'buddypress' ); ?></a>
 
                                                         <?php