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

Timestamp:

10/19/2015 07:47:01 PM (11 years ago)

Author:

r-a-y

Message:

Messages: Return context-appropriate error messages for messages_new_message().

This commit introduces the error_type parameter in the
messages_new_message() function, which allows for us to return
descriptive error messages to the user when 'error_type' is set to
'wp_error'.

This most notably addresses an issue when entering an invalid username
when composing a new private message.

Commit also includes a unit test.

Fixes #6535.

File:

• trunk/src/bp-messages/bp-messages-actions.php (modified) (1 diff)

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

@@ -85 +85 @@
 
                         // Attempt to send the message
-                        $thread_id  = messages_new_message( array(
+                        $send = messages_new_message( array(
                                 'recipients' => $recipients,
                                 'subject'    => $_POST['subject'],
-                                'content'    => $_POST['content']
+                                'content'    => $_POST['content'],
+                                'error_type' => 'wp_error'
                         ) );
 
                         // Send the message and redirect to it
-                        if ( ! empty( $thread_id ) ) {
+                        if ( true === is_int( $send ) ) {
                                 $success     = true;
                                 $feedback    = __( 'Message successfully sent.', 'buddypress' );
                                 $view        = trailingslashit( $member_messages . 'view' );
-                                $redirect_to = trailingslashit( $view . $thread_id );
+                                $redirect_to = trailingslashit( $view . $send );
 
                         // Message could not be sent
                         } else {
                                 $success  = false;
-                                $feedback = __( 'Message was not sent. Please try again.', 'buddypress' );
+                                $feedback = $send->get_error_message();
                         }
                 }