Ticket #20494: comment_exists.patch

wp-admin/includes/comment.php

@@ -7 +7 @@
  */
 
 /**
- * {@internal Missing Short Description}}
+ * Determine if a comment exists based on author, date, and optionnaly post ID.
  *
  * @since 2.0.0
  * @uses $wpdb
  *
  * @param string $comment_author Author of the comment
  * @param string $comment_date Date of the comment
+ * @param integer $post_id Post ID of the comment. Defaults to 0. Search on all posts.
  * @return mixed Comment ID on success.
  */
-function comment_exists($comment_author, $comment_date) {
+function comment_exists($comment_author, $comment_date, $post_id = 0) {
         global $wpdb;
 
         $comment_author = stripslashes($comment_author);
         $comment_date = stripslashes($comment_date);
-
-        return $wpdb->get_var( $wpdb->prepare("SELECT comment_post_ID FROM $wpdb->comments
+        $post_id = (int) $post_id;
+        
+        if ( $post_id > 0 ) {
+                return $wpdb->get_var( $wpdb->prepare("SELECT comment_ID FROM $wpdb->comments
+                        WHERE comment_author = %s AND comment_date = %s AND comment_post_ID = %d", $comment_author, $comment_date, $post_id) );
+        } else {
+                return $wpdb->get_var( $wpdb->prepare("SELECT comment_ID FROM $wpdb->comments
                         WHERE comment_author = %s AND comment_date = %s", $comment_author, $comment_date) );
+        }
 }
 
 /**