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

Timestamp:

06/08/2017 04:06:24 AM (8 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/topics/functions.php (modified) (4 diffs)

trunk/src/includes/topics/functions.php

@@ -43 +43 @@
 
     // Insert topic
-    $topic_id = wp_insert_post( $topic_data );
+    $topic_id = wp_insert_post( $topic_data, false );
 
     // Bail if no topic was added
@@ -125 +125 @@
  * @uses do_action() Calls 'bbp_new_topic' with the topic id, forum id,
  *                    anonymous data and reply author
- * @uses bbp_stick_topic() To stick or super stick the topic
- * @uses bbp_unstick_topic() To unstick the topic
  * @uses bbp_get_topic_permalink() To get the topic permalink
  * @uses bbp_redirect() To redirect to the topic link
@@ -352 +350 @@
 
     // Insert topic
-    $topic_id = wp_insert_post( $topic_data );
+    $topic_id = wp_insert_post( $topic_data, true );
 
     /** No Errors *************************************************************/
@@ -427 +425 @@
         bbp_redirect( $redirect_url );
 
-    // Errors
+    /** Errors ****************************************************************/
+
+    // WP_Error
+    } elseif ( is_wp_error( $topic_id ) ) {
+        bbp_add_error( 'bbp_topic_error', sprintf( __( '<strong>ERROR</strong>: The following problem(s) occurred: %s', 'bbpress' ), $topic_id->get_error_message() ) );
+
+    // Generic error
     } else {
-        $append_error = ( is_wp_error( $topic_id ) && $topic_id->get_error_message() ) ? $topic_id->get_error_message() . ' ' : '';
-        bbp_add_error( 'bbp_topic_error', __( '<strong>ERROR</strong>: The following problem(s) have been found with your topic:' . $append_error, 'bbpress' ) );
+        bbp_add_error( 'bbp_topic_error', __( '<strong>ERROR</strong>: The topic was not created.', 'bbpress' ) );
     }
 }