Changeset 10586 for branches/2.4/src/bp-messages/bp-messages-functions.php

Timestamp:

02/12/2016 11:30:39 PM (9 years ago)

Author:

r-a-y

Message:

Messages: Return generic WP Error in messages_new_message() when necessary.

In #6535, we added an 'error_type' parameter in messages_new_message()
that supports returning a WP Error object if error type is set to
'wp_error'. However, we did not return a WP error further down in the
messages_new_message() function, which can result in a potential fatal
error to occur.

This commit rectifies this and includes a unit test.

Anti-props r-a-y.

Fixes #6894 (2.4-branch).

File:

• branches/2.4/src/bp-messages/bp-messages-functions.php (modified) (1 diff)

branches/2.4/src/bp-messages/bp-messages-functions.php

@@ -175 +175 @@
 
     // Bail if message failed to send.
-    if ( ! $message->send() ) {
+    $send = $message->send();
+    if ( false === is_int( $send ) ) {
+        if ( 'wp_error' === $r['error_type'] ) {
+            if ( is_wp_error( $send ) ) {
+                return $send;
+            } else {
+                return new WP_Error( 'message_generic_error', __( 'Message was not sent. Please try again.', 'buddypress' ) );
+            }
+        }
+
         return false;
     }