Changeset 6499 for trunk/src/includes/replies/functions.php

Timestamp:

06/08/2017 04:06:24 AM (9 years ago)

Author:

johnjamesjacoby

Message:

General: Audit wp_insert_post() usages.

Return a WP_Error object in some instances, and explicitly do not in others.

Where possible, use the error message in the user feedback response.

Fixes #2817.

File:

• trunk/src/includes/replies/functions.php (modified) (3 diffs)

trunk/src/includes/replies/functions.php

@@ -43 +43 @@
 
         // Insert reply
-        $reply_id = wp_insert_post( $reply_data );
+        $reply_id = wp_insert_post( $reply_data, false );
 
         // Bail if no reply was added
@@ -404 +404 @@
 
         // Insert reply
-        $reply_id = wp_insert_post( $reply_data );
+        $reply_id = wp_insert_post( $reply_data, true );
 
         /** No Errors *************************************************************/
@@ -492 +492 @@
         /** Errors ****************************************************************/
 
+        // WP_Error
+        } elseif ( is_wp_error( $reply_id ) ) {
+                bbp_add_error( 'bbp_reply_error', sprintf( __( '<strong>ERROR</strong>: The following problem(s) occurred: %s', 'bbpress' ), $reply_id->get_error_message() ) );
+
+        // Generic error
         } else {
-                $append_error = ( is_wp_error( $reply_id ) && $reply_id->get_error_message() ) ? $reply_id->get_error_message() . ' ' : '';
-                bbp_add_error( 'bbp_reply_error', __( '<strong>ERROR</strong>: The following problem(s) have been found with your reply:' . $append_error . 'Please try again.', 'bbpress' ) );
+                bbp_add_error( 'bbp_reply_error', __( '<strong>ERROR</strong>: The reply was not created.', 'bbpress' ) );
         }
 }