Changeset 37888

Timestamp:

06/28/2016 10:02:19 AM (8 years ago)

Author:

ocean90

Message:

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 #36702, #14268.

Location:

trunk/src/wp-admin

Files:

• includes/upgrade.php (modified) (2 diffs)
• network/settings.php (modified) (2 diffs)

trunk/src/wp-admin/includes/upgrade.php

@@ -192 +192 @@
 
     // Default comment
-    $first_comment_author = __('Mr WordPress');
+    $first_comment_author = __( 'A WordPress Commenter' );
+    $first_comment_email = 'wapuu@wordpress.example';
     $first_comment_url = 'https://wordpress.org/';
-    $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.');
+    $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>.' );
     if ( is_multisite() ) {
         $first_comment_author = get_site_option( 'first_comment_author', $first_comment_author );
+        $first_comment_email = get_site_option( 'first_comment_email', $first_comment_email );
         $first_comment_url = get_site_option( 'first_comment_url', network_home_url() );
         $first_comment = get_site_option( 'first_comment', $first_comment );
@@ -204 +207 @@
         'comment_post_ID' => 1,
         'comment_author' => $first_comment_author,
-        'comment_author_email' => '',
+        'comment_author_email' => $first_comment_email,
         'comment_author_url' => $first_comment_url,
         'comment_date' => $now,

trunk/src/wp-admin/network/settings.php

@@ -63 +63 @@
         'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'global_terms_enabled',
         'illegal_names', 'limited_email_domains', 'banned_email_domains', 'WPLANG', 'admin_email',
+        'first_comment_email',
     );
 
@@ -262 +263 @@
                     <p class="description" id="first-comment-author-desc">
                         <?php _e( 'The author of the first comment on a new site.' ) ?>
+                    </p>
+                </td>
+            </tr>
+            <tr>
+                <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>