<!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>[53729] trunk: Coding Standards: Standardize on `user_id` when passing data to comment functions.</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 { white-space: pre-line; 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/53729">53729</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/53729","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-07-20 14:12:02 +0000 (Wed, 20 Jul 2022)</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'>Coding Standards: Standardize on `user_id` when passing data to comment functions.
The `wp_new_comment()`, `wp_update_comment()`, and `wp_filter_comment()` functions already normalize the `user_ID` parameter internally to `user_id`, which matches the database field name.
This commit aims to bring some consistency when passing the parameter in core.
The corresponding `$user_ID` variable is also renamed to `$user_id` to match the other variables when not referring to the `$user_ID` global, which has an exception in the WordPress coding standards.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/8543">[8543]</a>, <a href="https://core.trac.wordpress.org/changeset/8720">[8720]</a>, <a href="https://core.trac.wordpress.org/changeset/12267">[12267]</a>, <a href="https://core.trac.wordpress.org/changeset/12300">[12300]</a>, <a href="https://core.trac.wordpress.org/changeset/26491">[26491]</a>, <a href="https://core.trac.wordpress.org/changeset/28915">[28915]</a>, <a href="https://core.trac.wordpress.org/changeset/28922">[28922]</a>, <a href="https://core.trac.wordpress.org/changeset/34799">[34799]</a>, <a href="https://core.trac.wordpress.org/changeset/49303">[49303]</a>.
See <a href="https://core.trac.wordpress.org/ticket/55647">#55647</a>, <a href="https://core.trac.wordpress.org/ticket/56244">#56244</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestcommentscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.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="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2022-07-20 13:19:51 UTC (rev 53728)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2022-07-20 14:12:02 UTC (rev 53729)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1297,7 +1297,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user = wp_get_current_user();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user->exists() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_ID = $user->ID;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = $user->ID;
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_author = wp_slash( $user->display_name );
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_author_email = wp_slash( $user->user_email );
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_author_url = wp_slash( $user->user_url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1343,7 +1343,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_ID'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_id'
</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"> // Automatically approve parent comment.
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpxmlrpcserverphp"></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/class-wp-xmlrpc-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-xmlrpc-server.php 2022-07-20 13:19:51 UTC (rev 53728)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2022-07-20 14:12:02 UTC (rev 53729)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3950,7 +3950,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $comment['comment_author'] = $this->escape( $display_name );
</span><span class="cx" style="display: block; padding: 0 10px"> $comment['comment_author_email'] = $this->escape( $user_email );
</span><span class="cx" style="display: block; padding: 0 10px"> $comment['comment_author_url'] = $this->escape( $user_url );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment['user_ID'] = $user->ID;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment['user_id'] = $user->ID;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment['comment_author'] = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $content_struct['author'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3967,7 +3967,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $comment['comment_author_url'] = $content_struct['author_url'];
</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['user_ID'] = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment['user_id'] = 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_option( 'require_name_email' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strlen( $comment['comment_author_email'] ) < 6 || '' === $comment['comment_author'] ) {
</span></span></pre></div>
<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 2022-07-20 13:19:51 UTC (rev 53728)
+++ trunk/src/wp-includes/comment.php 2022-07-20 14:12:02 UTC (rev 53729)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2089,12 +2089,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the comment author's user ID before it is set.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The first time this filter is evaluated, 'user_ID' is checked
- * (for back-compat), followed by the standard 'user_id' value.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The first time this filter is evaluated, `user_ID` is checked
+ * (for back-compat), followed by the standard `user_id` value.
</ins><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"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $user_ID The comment author's user ID.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $user_id The comment author's user ID.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $commentdata['user_id'] = apply_filters( 'pre_user_id', $commentdata['user_ID'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $commentdata['user_id'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2132,7 +2132,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $commentdata['comment_author_url'] = apply_filters( 'pre_comment_author_url', $commentdata['comment_author_url'] );
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/comment.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $commentdata['comment_author_email'] = apply_filters( 'pre_comment_author_email', $commentdata['comment_author_email'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $commentdata['filtered'] = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $commentdata['filtered'] = true;
+
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2265,11 +2267,13 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $commentdata['comment_approved'] = wp_allow_comment( $commentdata, $wp_error );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $commentdata['comment_approved'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $commentdata['comment_approved'];
</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"> $comment_ID = wp_insert_comment( $commentdata );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $comment_ID ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2468,6 +2472,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // First, get all of the original fields.
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = get_comment( $commentarr['comment_ID'], ARRAY_A );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $comment ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_error ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'invalid_comment_id', __( 'Invalid comment ID.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3421,14 +3426,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Comment|WP_Error A WP_Comment object on success, a WP_Error object on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_handle_comment_submission( $comment_data ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> $comment_post_id = 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_parent = 0;
- $user_ID = 0;
</del><span class="cx" style="display: block; padding: 0 10px"> $comment_author = null;
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_author_email = null;
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_author_url = null;
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_content = null;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_parent = 0;
+ $user_id = 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $comment_data['comment_post_ID'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_post_id = (int) $comment_data['comment_post_ID'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3553,7 +3557,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_author = $user->display_name;
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_author_email = $user->user_email;
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_author_url = $user->user_url;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_ID = $user->ID;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = $user->ID;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'unfiltered_html' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $comment_data['_wp_unfiltered_html_comment'] )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3583,6 +3587,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $commentdata = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => $comment_post_id,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_ID' => $user_id,
</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"> $commentdata += compact(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3592,7 +3597,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_content',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_parent',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_ID'
</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></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestcommentscontrollerphp"></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/rest-api/endpoints/class-wp-rest-comments-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php 2022-07-20 13:19:51 UTC (rev 53728)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php 2022-07-20 14:12:02 UTC (rev 53729)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1883,11 +1883,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $prepared_comment,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => 0,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'comment_parent' => 0,
- 'user_ID' => 0,
</del><span class="cx" style="display: block; padding: 0 10px"> 'comment_author' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author_email' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author_url' => null,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'comment_parent' => 0,
+ 'user_id' => 0,
</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></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 2022-07-20 13:19:51 UTC (rev 53728)
+++ trunk/tests/phpunit/tests/comment-submission.php 2022-07-20 14:12:02 UTC (rev 53729)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -811,7 +811,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'preprocess_comment', array( $this, 'filter_preprocess_comment' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $comment );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSameSets(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author' => $user->display_name,
</span></span></pre>
</div>
</div>
</body>
</html>