Make WordPress Core

Ticket #36702: 36702.4.diff

File 36702.4.diff, 3.1 KB (added by rachelbaker, 8 years ago)

minor spacing and url typo fix to prepare for commit

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

     
    191191        $wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => $cat_tt_id, 'object_id' => 1) );
    192192
    193193        // Default comment
    194         $first_comment_author = __('Mr WordPress');
     194        $first_comment_author = __( 'A WordPress Commenter' );
     195        $first_comment_email = 'wapuu@wordpress.org';
    195196        $first_comment_url = 'https://wordpress.org/';
    196         $first_comment = __('Hi, this is a comment.
    197 To delete a comment, just log in and view the post's comments. There you will have the option to edit or delete them.');
     197        $first_comment = __( 'Hi, this is a comment.
     198To delete a comment, just log in and view the post's comments. There you will have the option to edit or delete them.
     199Commenter avatars come from <a href="https://gravatar.com">Gravatar</a>.' );
    198200        if ( is_multisite() ) {
    199201                $first_comment_author = get_site_option( 'first_comment_author', $first_comment_author );
     202                $first_comment_email = get_site_option( 'first_comment_email', $first_comment_email );
    200203                $first_comment_url = get_site_option( 'first_comment_url', network_home_url() );
    201204                $first_comment = get_site_option( 'first_comment', $first_comment );
    202205        }
     
    203206        $wpdb->insert( $wpdb->comments, array(
    204207                'comment_post_ID' => 1,
    205208                'comment_author' => $first_comment_author,
    206                 'comment_author_email' => '',
     209                'comment_author_email' => $first_comment_email,
    207210                'comment_author_url' => $first_comment_url,
    208211                'comment_date' => $now,
    209212                'comment_date_gmt' => $now_gmt,
  • src/wp-admin/network/settings.php

     
    6262                'first_post', 'first_page', 'first_comment', 'first_comment_url', 'first_comment_author',
    6363                'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'global_terms_enabled',
    6464                'illegal_names', 'limited_email_domains', 'banned_email_domains', 'WPLANG', 'admin_email',
     65                'first_comment_email',
    6566        );
    6667
    6768        // Handle translation install.
     
    265266                                </td>
    266267                        </tr>
    267268                        <tr>
     269                                <th scope="row"><label for="first_comment_email"><?php _e( 'First Comment Email' ) ?></label></th>
     270                                <td>
     271                                        <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' ) ); ?>" />
     272                                        <p class="description" id="first-comment-email-desc">
     273                                                <?php _e( 'The email address of the first comment author on a new site.' ) ?>
     274                                        </p>
     275                                </td>
     276                        </tr>
     277                        <tr>
    268278                                <th scope="row"><label for="first_comment_url"><?php _e( 'First Comment URL' ) ?></label></th>
    269279                                <td>
    270280                                        <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' ) ) ?>" />