<!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>[37888] trunk/src/wp-admin: Comments: Improve author and content of the default comment.</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/37888">37888</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/37888","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-06-28 10:02:19 +0000 (Tue, 28 Jun 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: Improve author and content of the default comment.
The new comment:
> A WordPress Commenter <!wapuu@wordpress.example>:
>
> Hi, this is a comment.
> To moderate comments, just log in. There you will have the option to edit or delete them.
> Commenter avatars come from <a href="!https://gravatar.com">Gravatar</a>.
Also introduces a network setting to set the email address of the first comment author on a new site.
Props Ipstenu, rachelbaker, jorbin, jeremyfelt.
Fixes <a href="https://core.trac.wordpress.org/ticket/36702">#36702</a>, <a href="https://core.trac.wordpress.org/ticket/14268">#14268</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpadminnetworksettingsphp">trunk/src/wp-admin/network/settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesupgradephp"></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/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php 2016-06-28 09:25:14 UTC (rev 37887)
+++ trunk/src/wp-admin/includes/upgrade.php 2016-06-28 10:02:19 UTC (rev 37888)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,19 +191,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => $cat_tt_id, 'object_id' => 1) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Default comment
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $first_comment_author = __('Mr WordPress');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $first_comment_author = __( 'A WordPress Commenter' );
+ $first_comment_email = 'wapuu@wordpress.example';
</ins><span class="cx" style="display: block; padding: 0 10px"> $first_comment_url = 'https://wordpress.org/';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $first_comment = __('Hi, this is a comment.
-To delete a comment, just log in and view the post's comments. There you will have the option to edit or delete them.');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $first_comment = __( 'Hi, this is a comment.
+To moderate comments, just log in. There you will have the option to edit or delete them.
+Commenter avatars come from <a href="https://gravatar.com">Gravatar</a>.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $first_comment_author = get_site_option( 'first_comment_author', $first_comment_author );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $first_comment_email = get_site_option( 'first_comment_email', $first_comment_email );
</ins><span class="cx" style="display: block; padding: 0 10px"> $first_comment_url = get_site_option( 'first_comment_url', network_home_url() );
</span><span class="cx" style="display: block; padding: 0 10px"> $first_comment = get_site_option( 'first_comment', $first_comment );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert( $wpdb->comments, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author' => $first_comment_author,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'comment_author_email' => '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'comment_author_email' => $first_comment_email,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_author_url' => $first_comment_url,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date' => $now,
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt' => $now_gmt,
</span></span></pre></div>
<a id="trunksrcwpadminnetworksettingsphp"></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/network/settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/settings.php 2016-06-28 09:25:14 UTC (rev 37887)
+++ trunk/src/wp-admin/network/settings.php 2016-06-28 10:02:19 UTC (rev 37888)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,6 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'first_post', 'first_page', 'first_comment', 'first_comment_url', 'first_comment_author',
</span><span class="cx" style="display: block; padding: 0 10px"> 'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'global_terms_enabled',
</span><span class="cx" style="display: block; padding: 0 10px"> 'illegal_names', 'limited_email_domains', 'banned_email_domains', 'WPLANG', 'admin_email',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'first_comment_email',
</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"> // Handle translation install.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,6 +266,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="first_comment_email"><?php _e( 'First Comment Email' ) ?></label></th>
+ <td>
+ <input type="text" size="40" name="first_comment_email" id="first_comment_email" aria-describedby="first-comment-email-desc" value="<?php echo esc_attr( get_site_option( 'first_comment_email' ) ); ?>" />
+ <p class="description" id="first-comment-email-desc">
+ <?php _e( 'The email address of the first comment author on a new site.' ) ?>
+ </p>
+ </td>
+ </tr>
+ <tr>
</ins><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="first_comment_url"><?php _e( 'First Comment URL' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" size="40" name="first_comment_url" id="first_comment_url" aria-describedby="first-comment-url-desc" value="<?php echo esc_attr( get_site_option( 'first_comment_url' ) ) ?>" />
</span></span></pre>
</div>
</div>
</body>
</html>