Changeset 11537

Timestamp:

04/27/2017 03:28:36 AM (9 years ago)

Author:

r-a-y

Message:

Messages: Fix redirection issue when attempting to view a valid private message thread.

Previously, attempting to go to a valid private message thread URL when
logged out would throw a 404.

This commit properly redirects non-authenticated users attempting to view
a private message thread to the login screen. If a user is authenticated,
but is attempting to view a private message thread without access rights,
we redirect the user back to their own "Messages" page with a notice.

See #7349.

Location:

trunk/src/bp-messages

Files:

• bp-messages-actions.php (modified) (1 diff)
• bp-messages-screens.php (modified) (1 diff)

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

@@ -223 +223 @@
 
         if ( ! messages_is_valid_thread( $thread_id ) || ( ! messages_check_thread_access( $thread_id ) && ! bp_current_user_can( 'bp_moderate' ) ) ) {
-                bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() ) );
+                return;
         }
 

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

@@ -121 +121 @@
         $thread_id = (int) bp_action_variable( 0 );
 
-        if ( empty( $thread_id ) || ! messages_is_valid_thread( $thread_id ) || ( ! messages_check_thread_access( $thread_id ) && ! bp_current_user_can( 'bp_moderate' ) ) ) {
+        if ( empty( $thread_id ) || ! messages_is_valid_thread( $thread_id ) ) {
                 bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() ) );
+        }
+
+        // No access.
+        if ( ! messages_check_thread_access( $thread_id ) && ! bp_current_user_can( 'bp_moderate' ) ) {
+                // If not logged in, prompt for login.
+                if ( ! is_user_logged_in() ) {
+                        bp_core_no_access();
+                        return;
+
+                // Redirect away.
+                } else {
+                        bp_core_add_message( __( 'You do not have access to that message thread.', 'buddypress' ), 'error' );
+                        bp_core_redirect( trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() ) );
+                }
         }