Ticket #3175: vroom_vroom.diff

wp-includes/default-filters.php

@@ -38 +38 @@
-
-add_filter('comment_email', 'antispambot');
-
+add_filter('comment_flood_filter', 'wp_throttle_comment_flood', 10, 3);
+
-add_filter('comment_url', 'clean_url');
-
-add_filter('comment_text', 'convert_chars');

wp-includes/comment.php

@@ -187 +187 @@
-        if ( $lasttime = $wpdb->get_var("SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_author_IP = '$comment_author_IP' OR comment_author_email = '$comment_author_email' ORDER BY comment_date DESC LIMIT 1") ) {
-                $time_lastcomment = mysql2date('U', $lasttime);
-                $time_newcomment  = mysql2date('U', $comment_date_gmt);
-
+
+
-                        do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);
-Sorry, you can only post a new comment once every 15 seconds. Slow down cowboy
+You are posting comments too quickly.  Slow down
-                }
-        }
-
@@ -355 +356 @@
-        return $commentdata;
-}
-
+function wp_throttle_comment_flood($block, $time_lastcomment, $time_newcomment) {
+        if ( $block ) // a plugin has already blocked... we'll let that decision stand
+                return $block;
+        if ( ($time_newcomment - $time_lastcomment) < 15 )
+                return true;
+        return false;
+}
+
-function wp_new_comment( $commentdata ) {
-        $commentdata = apply_filters('preprocess_comment', $commentdata);
-