Ticket #36702: 36702.6.diff

src/wp-admin/includes/upgrade.php

@@ -191 +191 @@
         $wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => $cat_tt_id, 'object_id' => 1) );
 
         // 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 );
         }
@@ -203 +206 @@
         $wpdb->insert( $wpdb->comments, array(
                 '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,
                 'comment_date_gmt' => $now_gmt,

src/wp-admin/network/settings.php

@@ -62 +62 @@
                 'first_post', 'first_page', 'first_comment', 'first_comment_url', 'first_comment_author',
                 'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'global_terms_enabled',
                 'illegal_names', 'limited_email_domains', 'banned_email_domains', 'WPLANG', 'admin_email',
+                'first_comment_email',
         );
 
         // Handle translation install.
@@ -265 +266 @@
                                 </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>
+                        </tr>
+                        <tr>
                                 <th scope="row"><label for="first_comment_url"><?php _e( 'First Comment URL' ) ?></label></th>
                                 <td>
                                         <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' ) ) ?>" />