Ticket #6506: 6506.03.patch

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

@@ -195 +195 @@
 function messages_screen_notices() {
         global $notice_id;
 
-        if ( !bp_current_user_can( 'bp_moderate' ) ) {
-                return false;
-        }
+        $notice_id = (int) bp_action_variable( 1 );
 
-        $notice_id = (int)bp_action_variable( 1 );
-
         if ( !empty( $notice_id ) && is_numeric( $notice_id ) ) {
                 $notice = new BP_Messages_Notice( $notice_id );
 

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

@@ -388 +388 @@
  * }
  * @return bool True if there are threads to display, otherwise false.
  */
-function bp_has_message_threads( $args = '' ) {
+function bp_has_message_threads( $args = array() ) {
         global $messages_template;
 
         // The default box the user is looking at
-        if ( bp_is_current_action( 'sentbox' ) ) {
-                $default_box = 'sentbox';
-        } elseif ( bp_is_current_action( 'notices' ) ) {
-                $default_box = 'notices';
-        } else {
-                $default_box = 'inbox';
+        $current_action = bp_current_action();
+        switch ( $current_action ) {
+                case 'sentbox' :
+                case 'notices' :
+                case 'inbox'   :
+                        $default_box = $current_action;
+                        break;
+                default :
+                        $default_box = 'inbox';
+                        break;
         }
 
+        // User ID
+        $user_id = bp_loggedin_user_id();
+
+        // Search Terms
+        $search_terms = isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '';
+
         // Parse the arguments
         $r = bp_parse_args( $args, array(
-                'user_id'      => bp_loggedin_user_id(),
+                'user_id'      => $user_id,
                 'box'          => $default_box,
                 'per_page'     => 10,
                 'max'          => false,
                 'type'         => 'all',
-                'search_terms' => isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '',
+                'search_terms' => $search_terms,
                 'page_arg'     => 'mpage', // See https://buddypress.trac.wordpress.org/ticket/3679
                 'meta_query'   => array()
         ), 'has_message_threads' );
 
-        // If trying to access notices without capabilities, redirect to root domain
-        if ( bp_is_current_action( 'notices' ) && !bp_current_user_can( 'bp_moderate' ) ) {
-                bp_core_redirect( bp_displayed_user_domain() );
-        }
-
         // Load the messages loop global up with messages
         $messages_template = new BP_Messages_Box_Template( $r );