From b2642750ce5f239afc03b81fb65e8da311bd9a30 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Wed, 21 Jan 2015 23:03:48 +0000 Subject: [PATCH] Comments: When a comment fails to insert, remove any invalid characters and try again. See #21212 git-svn-id: https://develop.svn.wordpress.org/trunk@31263 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/comment.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/wp-includes/comment.php b/src/wp-includes/comment.php index a4f104f41b..693af2e9e6 100644 --- a/src/wp-includes/comment.php +++ b/src/wp-includes/comment.php @@ -1925,7 +1925,17 @@ function wp_insert_comment( $commentdata ) { $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' ); if ( ! $wpdb->insert( $wpdb->comments, $compacted ) ) { - return false; + $fields = array( 'comment_author', 'comment_content' ); + + foreach( $fields as $field ) { + if ( isset( $compacted[ $field ] ) ) { + $post_data[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->comments, $field, $compacted[ $field ] ); + } + } + + if ( ! $wpdb->insert( $wpdb->comments, $compacted ) ) { + return false; + } } $id = (int) $wpdb->insert_id;