Changeset 32364 for trunk/src/wp-includes/comment.php

Timestamp:

05/06/2015 02:59:50 AM (10 years ago)

Author:

pento

Message:

WPDB: When checking that a string can be sent to MySQL, we shouldn't use mb_convert_encoding(), as it behaves differently to MySQL's character encoding conversion.

Props mdawaffe, pento, nbachiyski, jorbin, johnjamesjacoby, jeremyfelt.

See #32165.

File:

• trunk/src/wp-includes/comment.php (modified) (3 diffs)

trunk/src/wp-includes/comment.php

@@ -2119 +2119 @@
     $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 ) ) {
-        $fields = array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content' );
-
-        foreach( $fields as $field ) {
-            if ( isset( $compacted[ $field ] ) ) {
-                $compacted[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->comments, $field, $compacted[ $field ] );
-            }
-        }
-
-        if ( ! $wpdb->insert( $wpdb->comments, $compacted ) ) {
-            return false;
-        }
+        return false;
     }
 
@@ -2253 +2243 @@
  */
 function wp_new_comment( $commentdata ) {
+    global $wpdb;
+
     if ( isset( $commentdata['user_ID'] ) ) {
         $commentdata['user_id'] = $commentdata['user_ID'] = (int) $commentdata['user_ID'];
@@ -2296 +2288 @@
     $comment_ID = wp_insert_comment($commentdata);
     if ( ! $comment_ID ) {
-        return false;
+        $fields = array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content' );
+
+        foreach( $fields as $field ) {
+            if ( isset( $commentdata[ $field ] ) ) {
+                $commentdata[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->comments, $field, $commentdata[ $field ] );
+            }
+        }
+
+        $commentdata = wp_filter_comment( $commentdata );
+
+        $commentdata['comment_approved'] = wp_allow_comment( $commentdata );
+
+        $comment_ID = wp_insert_comment( $commentdata );
+        if ( ! $comment_ID ) {
+            return false;
+        }
     }