<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[38778] trunk: Comments: Abstract `die()` calls from comment submission routine.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/38778">38778</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/38778","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-10-11 03:42:28 +0000 (Tue, 11 Oct 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Comments: Abstract `die()` calls from comment submission routine.
Since 4.4, comment submission has been mostly abstracted into a function,
rather than being processed inline in wp-comments-post.php. This change
made it easier to write automated tests against the bulk of the comment
submission process. `wp_allow_comment()` remained untestable, however:
when a comment failed one of its checks (flooding, duplicates, etc),
`die()` or `wp_die()` would be called directly. This shortcoming posed
problems for any application attempting to use WP's comment verification
functions in an abstract way - from PHPUnit to the REST API.
The current changeset introduces a new parameter, `$avoid_die`, to the
`wp_new_comment()` stack. When set to `true`, `wp_new_comment()` and
`wp_allow_comment()` will return `WP_Error` objects when a comment check
fails. When set to `false` - the default, for backward compatibility -
a failed check will result in a `die()` or `wp_die()`, as appropriate.
Prior to this changeset, default comment flood checks took place in the
function `check_comment_flood_db()`, which was hooked to the
'check_comment_flood' action. This design allowed the default comment
flood routine to be bypassed or replaced using `remove_action()`.
In order to maintain backward compatibility with this usage, while
simultaneously converting the comment flood logic into something that
returns a value rather than calling `die()` directly,
`check_comment_flood_db()` has been changed into a wrapper function for
a call to `add_filter()`; this, in turn, adds the *actual* comment flood
check to a new filter, 'wp_is_comment_flood'. Note that direct calls
to `check_comment_flood_db()` will no longer do anything in isolation.
Props websupporter, rachelbaker.
Fixes <a href="https://core.trac.wordpress.org/ticket/36901">#36901</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunktestsphpunittestscommentsubmissionphp">trunk/tests/phpunit/tests/comment-submission.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment.php 2016-10-11 03:26:11 UTC (rev 38777)
+++ trunk/src/wp-includes/comment.php 2016-10-11 03:42:28 UTC (rev 38778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -588,13 +588,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Validates whether this comment is allowed to be made.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.7.0 The `$avoid_die` parameter was added, allowing the function to
+ * return a WP_Error object instead of dying.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $commentdata Contains information on the comment
- * @return int|string Signifies the approval status (0|1|'spam')
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $commentdata Contains information on the comment.
+ * @param bool $avoid_die When true, a disallowed comment will result in the function
+ * returning a WP_Error object, rather than executing wp_die().
+ * Default false.
+ * @return int|string|WP_Error Allowed comments return the approval status (0|1|'spam').
+ * If `$avoid_die` is true, disallowed comments return a WP_Error.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_allow_comment( $commentdata ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_allow_comment( $commentdata, $avoid_die = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Simple duplicate check
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -639,10 +645,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $commentdata Comment data.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'comment_duplicate_trigger', $commentdata );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( wp_doing_ajax() ) {
- die( __('Duplicate comment detected; it looks as though you’ve already said that!') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( true === $avoid_die ) {
+ return new WP_Error( 'comment_duplicate', __( 'Duplicate comment detected; it looks as though you’ve already said that!' ), $dupe_id );
+ } else {
+ if ( wp_doing_ajax() ) {
+ die( __('Duplicate comment detected; it looks as though you’ve already said that!') );
+ }
+
+ wp_die( __( 'Duplicate comment detected; it looks as though you’ve already said that!' ), 409 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'Duplicate comment detected; it looks as though you’ve already said that!' ), 409 );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -651,18 +662,49 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Allows checking for comment flooding.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.7.0 The `$avoid_die` parameter was added.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $comment_author_IP Comment author's IP address.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $comment_author_email Comment author's email.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $comment_date_gmt GMT date the comment was posted.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $avoid_die Whether to prevent executing wp_die()
+ * or die() if a comment flood is occurring.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action(
</span><span class="cx" style="display: block; padding: 0 10px"> 'check_comment_flood',
</span><span class="cx" style="display: block; padding: 0 10px"> $commentdata['comment_author_IP'],
</span><span class="cx" style="display: block; padding: 0 10px"> $commentdata['comment_author_email'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $commentdata['comment_date_gmt']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $commentdata['comment_date_gmt'],
+ $avoid_die
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Filters whether a comment is part of a comment flood.
+ *
+ * The default check is wp_check_comment_flood(). See check_comment_flood_db().
+ *
+ * @since 4.7.0
+ *
+ * @param bool $is_flood Is a comment flooding occurring? Default false.
+ * @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 bool $avoid_die Whether to prevent executing wp_die()
+ * or die() if a comment flood is occurring.
+ */
+ $is_flood = apply_filters(
+ 'wp_is_comment_flood',
+ false,
+ $commentdata['comment_author_IP'],
+ $commentdata['comment_author_email'],
+ $commentdata['comment_date_gmt'],
+ $avoid_die
+ );
+
+ if ( $is_flood ) {
+ return new WP_Error( 'comment_flood', __( 'You are posting comments too quickly. Slow down.' ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $commentdata['user_id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $commentdata['user_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_author = $wpdb->get_var( $wpdb->prepare(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -715,24 +757,50 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Check whether comment flooding is occurring.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Hooks WP's native database-based comment-flood check.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * This wrapper maintains backward compatibility with plugins that expect to
+ * be able to unhook the legacy check_comment_flood_db() function from
+ * 'check_comment_flood' using remove_action().
+ *
+ * @since 2.3.0
+ * @since 4.7.0 Converted to be an add_filter() wrapper.
+ */
+function check_comment_flood_db() {
+ add_filter( 'wp_is_comment_flood', 'wp_check_comment_flood', 10, 5 );
+}
+
+/**
+ * Checks whether comment flooding is occurring.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * Won't run, if current user can manage options, so to not block
</span><span class="cx" style="display: block; padding: 0 10px"> * administrators.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 2.3.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.7.0
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $ip Comment IP.
- * @param string $email Comment author email address.
- * @param string $date MySQL time string.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $is_flood Is a comment flooding occurring?
+ * @param string $ip Comment IP.
+ * @param string $email Comment author email address.
+ * @param string $date MySQL time string.
+ * @param bool $avoid_die When true, a disallowed comment will result in the function
+ * returning a WP_Error object, rather than executing wp_die().
+ * Default false.
+ * @return bool Whether comment flooding is occurring.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function check_comment_flood_db( $ip, $email, $date ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_check_comment_flood( $is_flood, $ip, $email, $date, $avoid_die = false ) {
+
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Another callback has declared a flood. Trust it.
+ if ( true === $is_flood ) {
+ return $is_flood;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // don't throttle admins or moderators
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'manage_options' ) || current_user_can( 'moderate_comments' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return false;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $hour_ago = gmdate( 'Y-m-d H:i:s', time() - HOUR_IN_SECONDS );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -774,13 +842,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $time_newcomment Timestamp of when the new comment was posted.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'comment_flood_trigger', $time_lastcomment, $time_newcomment );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( true === $avoid_die ) {
+ return true;
+ } else {
+ if ( wp_doing_ajax() ) {
+ die( __('You are posting comments too quickly. Slow down.') );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( wp_doing_ajax() )
- die( __('You are posting comments too quickly. Slow down.') );
-
- wp_die( __( 'You are posting comments too quickly. Slow down.' ), 429 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'You are posting comments too quickly. Slow down.' ), 429 );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ return false;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1730,6 +1804,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.3.0 'comment_agent' and 'comment_author_IP' can be set via `$commentdata`.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.7.0 The `$avoid_die` parameter was added, allowing the function to
+ * return a WP_Error object instead of dying.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see wp_insert_comment()
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1753,9 +1829,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $comment_author_IP Comment author IP address in IPv4 format. Default is the value of
</span><span class="cx" style="display: block; padding: 0 10px"> * 'REMOTE_ADDR' in the `$_SERVER` superglobal sent in the original request.
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return int|false The ID of the comment on success, false on failure.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $avoid_die Should errors be returned as WP_Error objects instead of
+ * executing wp_die()? Default false.
+ * @return int|false|WP_Error The ID of the comment on success, false or WP_Error on failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_new_comment( $commentdata ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_new_comment( $commentdata, $avoid_die = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $commentdata['user_ID'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1804,7 +1882,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $commentdata = wp_filter_comment($commentdata);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $commentdata['comment_approved'] = wp_allow_comment($commentdata);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $commentdata['comment_approved'] = wp_allow_comment( $commentdata, $avoid_die );
+ if ( is_wp_error( $commentdata['comment_approved'] ) ) {
+ return $commentdata['comment_approved'];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ID = wp_insert_comment($commentdata);
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $comment_ID ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1818,7 +1899,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $commentdata = wp_filter_comment( $commentdata );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $commentdata['comment_approved'] = wp_allow_comment( $commentdata );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $commentdata['comment_approved'] = wp_allow_comment( $commentdata, $avoid_die );
+ if ( is_wp_error( $commentdata['comment_approved'] ) ) {
+ return $commentdata['comment_approved'];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ID = wp_insert_comment( $commentdata );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $comment_ID ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2940,11 +3024,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_ID'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_id = wp_new_comment( wp_slash( $commentdata ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_id = wp_new_comment( wp_slash( $commentdata ), true );
+ if ( is_wp_error( $comment_id ) ) {
+ return $comment_id;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $comment_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'comment_save_error', __( '<strong>ERROR</strong>: The comment could not be saved. Please try again later.' ), 500 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return get_comment( $comment_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-filters.php 2016-10-11 03:26:11 UTC (rev 38777)
+++ trunk/src/wp-includes/default-filters.php 2016-10-11 03:42:28 UTC (rev 38778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +197,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'teeny_mce_before_init', '_mce_set_direction' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_kses', 'wp_pre_kses_less_than' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'sanitize_title', 'sanitize_title_with_dashes', 10, 3 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'check_comment_flood', 'check_comment_flood_db', 10, 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'check_comment_flood', 'check_comment_flood_db', 10, 4 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'comment_flood_filter', 'wp_throttle_comment_flood', 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_comment_content', 'wp_rel_nofollow', 15 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'comment_email', 'antispambot' );
</span></span></pre></div>
<a id="trunktestsphpunittestscommentsubmissionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/comment-submission.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment-submission.php 2016-10-11 03:26:11 UTC (rev 38777)
+++ trunk/tests/phpunit/tests/comment-submission.php 2016-10-11 03:42:28 UTC (rev 38778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -714,4 +714,71 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $commentdata;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 36901
+ */
+ public function test_submitting_duplicate_comments() {
+ $post = self::factory()->post->create_and_get( array(
+ 'post_status' => 'publish',
+ ) );
+ $data = array(
+ 'comment_post_ID' => $post->ID,
+ 'comment' => 'Did I say that?',
+ 'author' => 'Repeat myself',
+ 'email' => 'mail@example.com',
+ );
+ $first_comment = wp_handle_comment_submission( $data );
+ $second_comment = wp_handle_comment_submission( $data );
+ $this->assertWPError( $second_comment );
+ $this->assertSame( 'comment_duplicate', $second_comment->get_error_code() );
+ }
+
+ /**
+ * @ticket 36901
+ */
+ public function test_comments_flood() {
+ $post = self::factory()->post->create_and_get( array(
+ 'post_status' => 'publish',
+ ) );
+ $data = array(
+ 'comment_post_ID' => $post->ID,
+ 'comment' => 'Did I say that?',
+ 'author' => 'Repeat myself',
+ 'email' => 'mail@example.com',
+ );
+ $first_comment = wp_handle_comment_submission( $data );
+
+ $data['comment'] = 'Wow! I am quick!';
+ $second_comment = wp_handle_comment_submission( $data );
+
+ $this->assertWPError( $second_comment );
+ $this->assertSame( 'comment_flood', $second_comment->get_error_code() );
+ }
+
+ /**
+ * @ticket 36901
+ */
+ public function test_comments_flood_user_is_admin() {
+ $user = self::factory()->user->create_and_get( array(
+ 'role' => 'administrator',
+ ) );
+ wp_set_current_user( $user->ID );
+
+ $post = self::factory()->post->create_and_get( array(
+ 'post_status' => 'publish',
+ ) );
+ $data = array(
+ 'comment_post_ID' => $post->ID,
+ 'comment' => 'Did I say that?',
+ 'author' => 'Repeat myself',
+ 'email' => 'mail@example.com',
+ );
+ $first_comment = wp_handle_comment_submission( $data );
+
+ $data['comment'] = 'Wow! I am quick!';
+ $second_comment = wp_handle_comment_submission( $data );
+
+ $this->assertNotWPError( $second_comment );
+ $this->assertEquals( $post->ID, $second_comment->comment_post_ID );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>