WP Merge to rev 4273

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@788 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 2 insertions, 0 deletions

diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php
index 75f24ed..ad60242 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -38,6 +38,8 @@ add_filter('comment_author', 'wp_specialchars');
 
 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');