Changeset 6499

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.

Location:

trunk/src/includes

Files:

• admin/classes/class-bbp-converter-base.php (modified) (1 diff)
• forums/functions.php (modified) (4 diffs)
• replies/functions.php (modified) (3 diffs)
• topics/functions.php (modified) (4 diffs)

trunk/src/includes/admin/classes/class-bbp-converter-base.php

@@ -596 +596 @@
 
                             default:
-                                $post_id = wp_insert_post( $insert_post );
+                                $post_id = wp_insert_post( $insert_post, true );
 
                                 if ( is_numeric( $post_id ) ) {

trunk/src/includes/forums/functions.php

@@ -43 +43 @@
 
     // Insert forum
-    $forum_id = wp_insert_post( $forum_data );
+    $forum_id = wp_insert_post( $forum_data, false );
 
     // Bail if no forum was added
@@ -118 +118 @@
  * @uses apply_filters() Calls 'bbp_new_forum_pre_content' with the content
  * @uses bbPress::errors::get_error_codes() To get the {@link WP_Error} errors
- * @uses wp_insert_post() To insert the forum
  * @uses do_action() Calls 'bbp_new_forum' with the forum id, forum id,
  *                    anonymous data and reply author
- * @uses bbp_stick_forum() To stick or super stick the forum
- * @uses bbp_unstick_forum() To unstick the forum
  * @uses bbp_get_forum_permalink() To get the forum permalink
  * @uses bbp_redirect() To redirect to the forum link
@@ -280 +277 @@
 
     // Insert forum
-    $forum_id = wp_insert_post( $forum_data );
+    $forum_id = wp_insert_post( $forum_data, true );
 
     /** No Errors *************************************************************/
@@ -355 +352 @@
         bbp_redirect( $redirect_url );
 
-    // Errors
+    /** Errors ****************************************************************/
+
+    // WP_Error
+    } elseif ( is_wp_error( $forum_id ) ) {
+        bbp_add_error( 'bbp_forum_error', sprintf( __( '<strong>ERROR</strong>: The following problem(s) occurred: %s', 'bbpress' ), $forum_id->get_error_message() ) );
+
+    // Generic error
     } else {
-        $append_error = ( is_wp_error( $forum_id ) && $forum_id->get_error_message() ) ? $forum_id->get_error_message() . ' ' : '';
-        bbp_add_error( 'bbp_forum_error', __( '<strong>ERROR</strong>: The following problem(s) have been found with your forum:' . $append_error, 'bbpress' ) );
+        bbp_add_error( 'bbp_forum_error', __( '<strong>ERROR</strong>: The forum was not created.', 'bbpress' ) );
     }
 }

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' ) );
     }
 }

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' ) );
     }
 }