From 4b9a726c5ae6a138656ad2f0794f6679ddbaa0d7 Mon Sep 17 00:00:00 2001
From: Dominik Schilling
Date: Tue, 28 Jun 2016 10:03:27 +0000
Subject: [PATCH] Comments: Improve author and content of the default comment.
The new comment:
> A WordPress Commenter :
>
> 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 Gravatar.
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.
Built from https://develop.svn.wordpress.org/trunk@37888
git-svn-id: http://core.svn.wordpress.org/trunk@37829 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
wp-admin/includes/upgrade.php | 11 +++++++----
wp-admin/network/settings.php | 10 ++++++++++
wp-includes/version.php | 2 +-
3 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 171634d005..d05686fa22 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -191,19 +191,22 @@ function wp_install_defaults( $user_id ) {
$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 Gravatar.' );
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 );
}
$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,
diff --git a/wp-admin/network/settings.php b/wp-admin/network/settings.php
index 3e6725478c..99ee30ec83 100644
--- a/wp-admin/network/settings.php
+++ b/wp-admin/network/settings.php
@@ -62,6 +62,7 @@ if ( $_POST ) {
'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.
@@ -264,6 +265,15 @@ if ( isset( $_GET['updated'] ) ) {
+
+
+
+
+
+
+
+
+
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1c7d6a8b6b..1b4f969d7e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
-$wp_version = '4.6-alpha-37887';
+$wp_version = '4.6-alpha-37888';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.