Ticket #5130: 5130.diff

src/wp-includes/comment.php

@@ -645 +645 @@
          * Allows checking for comment flooding.
          *
          * @since 2.3.0
+         * @since 4.6.0 $commentdata was added
          *
          * @param string $comment_author_IP    Comment author's IP address.
          * @param string $comment_author_email Comment author's email.
          * @param string $comment_date_gmt     GMT date the comment was posted.
+         * @param array  $commentdata          Comment Data.
          */
         do_action(
                 'check_comment_flood',
                 $commentdata['comment_author_IP'],
                 $commentdata['comment_author_email'],
-                $commentdata['comment_date_gmt']
+                $commentdata['comment_date_gmt'],
+                $commentdata
         );
 
         if ( ! empty( $commentdata['user_id'] ) ) {
@@ -715 +718 @@
  * administrators.
  *
  * @since 2.3.0
+ * @since 4.6.0 $commentdata parameter added
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string $ip Comment IP.
  * @param string $email Comment author email address.
  * @param string $date MySQL time string.
+ * @param array  $commentdata Full Comment Data.
  */
-function check_comment_flood_db( $ip, $email, $date ) {
+function check_comment_flood_db( $ip, $email, $date, $commentdata ) {
         global $wpdb;
+        $comment_type = ! isset( $commentdata['comment_type'] ) ? '' : $commentdata['comment_type'];
+
         // don't throttle admins or moderators
         if ( current_user_can( 'manage_options' ) || current_user_can( 'moderate_comments' ) ) {
                 return;
@@ -752 +759 @@
                  * Filter the comment flood status.
                  *
                  * @since 2.1.0
+                 * @since 4.6.0 Add $comment_type.
                  *
                  * @param bool $bool             Whether a comment flood is occurring. Default false.
                  * @param int  $time_lastcomment Timestamp of when the last comment was posted.
                  * @param int  $time_newcomment  Timestamp of when the new comment was posted.
+                 * @param string $comment_type   Comment Type.
                  */
-                $flood_die = apply_filters( 'comment_flood_filter', false, $time_lastcomment, $time_newcomment );
+                $flood_die = apply_filters( 'comment_flood_filter', false, $time_lastcomment, $time_newcomment, $comment_type );
                 if ( $flood_die ) {
                         /**
                          * Fires before the comment flood message is triggered.
@@ -1683 +1692 @@
  * Whether a comment should be blocked because of comment flood.
  *
  * @since 2.1.0
+ * @since 4.6.0 Add Comment Type.
  *
  * @param bool $block Whether plugin has already blocked comment.
  * @param int $time_lastcomment Timestamp for last comment.
  * @param int $time_newcomment Timestamp for new comment.
+ * @param string $comment_type Type of Comment.
  * @return bool Whether comment should be blocked.
  */
-function wp_throttle_comment_flood($block, $time_lastcomment, $time_newcomment) {
+function wp_throttle_comment_flood($block, $time_lastcomment, $time_newcomment, $comment_type) {
         if ( $block ) // a plugin has already blocked... we'll let that decision stand
                 return $block;
         if ( ($time_newcomment - $time_lastcomment) < 15 )

src/wp-includes/default-filters.php

@@ -190 +190 @@
 add_filter( 'teeny_mce_before_init',    '_mce_set_direction'                  );
 add_filter( 'pre_kses',                 'wp_pre_kses_less_than'               );
 add_filter( 'sanitize_title',           'sanitize_title_with_dashes',   10, 3 );
-add_action( 'check_comment_flood',      'check_comment_flood_db',       10, 3 );
-add_filter( 'comment_flood_filter',     'wp_throttle_comment_flood',    10, 3 );
+add_action( 'check_comment_flood',      'check_comment_flood_db',       10, 4 );
+add_filter( 'comment_flood_filter',     'wp_throttle_comment_flood',    10, 4 );
 add_filter( 'pre_comment_content',      'wp_rel_nofollow',              15    );
 add_filter( 'comment_email',            'antispambot'                         );
 add_filter( 'option_tag_base',          '_wp_filter_taxonomy_base'            );