Changeset 28672

Timestamp:

06/05/2014 04:37:02 AM (11 years ago)

Author:

SergeyBiryukov

Message:

wp_insert_comment() and wp_new_comment() should check if the comment was successfully inserted into the database.

props pento.
fixes #28254.

Location:

trunk/src

Files:

• wp-comments-post.php (modified) (1 diff)
• wp-includes/comment.php (modified) (4 diffs)

trunk/src/wp-comments-post.php

@@ -133 +133 @@
 
 $comment_id = wp_new_comment( $commentdata );
-$comment = get_comment($comment_id);
+if ( ! $comment_id ) {
+    wp_die( __( "<strong>ERROR</strong>: The comment could not be saved. Please try again later." ) );
+}
+
+$comment = get_comment( $comment_id );
 
 /**

trunk/src/wp-includes/comment.php

@@ -1583 +1583 @@
  *
  * @param array $commentdata Contains information on the comment.
- * @return int The new comment's ID.
+ * @return int|bool The new comment's ID on success, false on failure.
  */
 function wp_insert_comment( $commentdata ) {
@@ -1608 +1608 @@
 
     $compacted = compact( 'comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_date', 'comment_date_gmt', 'comment_content', 'comment_karma', 'comment_approved', 'comment_agent', 'comment_type', 'comment_parent', 'user_id' );
-    $wpdb->insert( $wpdb->comments, $compacted );
+    if ( ! $wpdb->insert( $wpdb->comments, $compacted ) ) {
+        return false;
+    }
 
     $id = (int) $wpdb->insert_id;
@@ -1728 +1730 @@
  * @since 1.5.0
  * @param array $commentdata Contains information on the comment.
- * @return int The ID of the comment after adding.
+ * @return int|bool The ID of the comment on success, false on failure.
  */
 function wp_new_comment( $commentdata ) {
@@ -1761 +1763 @@
 
     $comment_ID = wp_insert_comment($commentdata);
+    if ( ! $comment_ID ) {
+        return false;
+    }
 
     /**