<!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>[52029] trunk/src/wp-includes: Comments: Mark comment text field as required.</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/52029">52029</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/52029","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>joedolson</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-11-07 21:13:11 +0000 (Sun, 07 Nov 2021)</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: Mark comment text field as required.
Add required asterisk to the comment text field. Historically, the name and email fields are marked as required, but the comment text field is not, though it is actually a required field.
Props infected, solarissmoke, rianrietveld, afercia, sabernhardt, strider72, mai21, audrasjb.
Fixes <a href="https://core.trac.wordpress.org/ticket/16206">#16206</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescommenttemplatephp"></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-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment-template.php 2021-11-07 20:36:11 UTC (rev 52028)
+++ trunk/src/wp-includes/comment-template.php 2021-11-07 21:13:11 UTC (rev 52029)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2350,10 +2350,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['format'] = current_theme_supports( 'html5', 'comment-form' ) ? 'html5' : 'xhtml';
</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">- $req = get_option( 'require_name_email' );
- $html_req = ( $req ? " required='required'" : '' );
- $html5 = 'html5' === $args['format'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $req = get_option( 'require_name_email' );
+ $html5 = 'html5' === $args['format'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Define attributes in HTML5 or XHTML syntax.
+ $required_attribute = ( $html5 ? ' required' : ' required="required"' );
+ $checked_attribute = ( $html5 ? ' checked' : ' checked="checked"' );
+
+ // Identify required fields visually.
+ $required_indicator = ' <span class="required" aria-hidden="true">*</span>';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $fields = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'author' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="comment-form-author">%s %s</p>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2360,12 +2366,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<label for="author">%s%s</label>',
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Name' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( $req ? ' <span class="required">*</span>' : '' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( $req ? $required_indicator : '' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<input id="author" name="author" type="text" value="%s" size="30" maxlength="245"%s />',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $commenter['comment_author'] ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html_req
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( $req ? $required_attribute : '' )
</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"> 'email' => sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2373,13 +2379,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<label for="email">%s%s</label>',
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Email' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( $req ? ' <span class="required">*</span>' : '' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( $req ? $required_indicator : '' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<input id="email" name="email" %s value="%s" size="30" maxlength="100" aria-describedby="email-notes"%s />',
</span><span class="cx" style="display: block; padding: 0 10px"> ( $html5 ? 'type="email"' : 'type="text"' ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $commenter['comment_author_email'] ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html_req
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( $req ? $required_attribute : '' )
</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"> 'url' => sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2397,7 +2403,7 @@
</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"> if ( has_action( 'set_comment_cookies', 'wp_set_comment_cookies' ) && get_option( 'show_comments_cookies_opt_in' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $consent = empty( $commenter['comment_author_email'] ) ? '' : ' checked="checked"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $consent = empty( $commenter['comment_author_email'] ) ? '' : $checked_attribute;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $fields['cookies'] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="comment-form-cookies-consent">%s %s</p>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2419,8 +2425,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $required_text = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Asterisk symbol (*). */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ' ' . __( 'Required fields are marked %s' ),
- '<span class="required">*</span>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ' <span class="comment-required-message" aria-hidden="true">' . __( 'Required fields are marked %s' ) . '</span>',
+ trim( $required_indicator )
</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">@@ -2437,10 +2443,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_field' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="comment-form-comment">%s %s</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<label for="comment">%s</label>',
- _x( 'Comment', 'noun' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<label for="comment">%s%s</label>',
+ _x( 'Comment', 'noun' ),
+ $required_indicator
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525" required="required"></textarea>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525"' . $required_attribute . '></textarea>'
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'must_log_in' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="must-log-in">%s</p>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2452,7 +2459,7 @@
</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"> 'logged_in_as' => sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p class="logged-in-as">%s</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p class="logged-in-as">%s%s</p>',
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Edit user link, 2: Accessibility text, 3: User name, 4: Logout URL. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( '<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2462,7 +2469,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_identity,
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/link-template.php */
</span><span class="cx" style="display: block; padding: 0 10px"> wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ $required_text
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_notes_before' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<p class="comment-notes">%s%s</p>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2470,7 +2478,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<span id="email-notes">%s</span>',
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Your email address will not be published.' )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( $req ? $required_text : '' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $required_text
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_notes_after' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => site_url( '/wp-comments-post.php' ),
</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 2021-11-07 20:36:11 UTC (rev 52028)
+++ trunk/src/wp-includes/comment.php 2021-11-07 21:13:11 UTC (rev 52029)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3549,7 +3549,7 @@
</span><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' ) && ! $user->exists() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' == $comment_author_email || '' == $comment_author ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'require_name_email', __( '<strong>Error</strong>: Please fill the required fields (name, email).' ), 200 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'require_name_email', __( '<strong>Error</strong>: Please fill the required fields.' ), 200 );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! is_email( $comment_author_email ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'require_valid_email', __( '<strong>Error</strong>: Please enter a valid email address.' ), 200 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>