diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php
index 8ce5c2aac8..94ad771761 100644
--- a/src/wp-admin/includes/upgrade.php
+++ b/src/wp-admin/includes/upgrade.php
@@ -194,18 +194,19 @@ 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 = __( 'A WordPress Commenter' );
- $first_comment_email = 'wapuu@wordpress.example';
- $first_comment_url = 'https://wordpress.org/';
- $first_comment = __( 'Hi, this is a comment.
+ if ( is_multisite() ) {
+ $first_comment_author = get_site_option( 'first_comment_author' );
+ $first_comment_email = get_site_option( 'first_comment_email' );
+ $first_comment_url = get_site_option( 'first_comment_url', network_home_url() );
+ $first_comment = get_site_option( 'first_comment' );
+ }
+
+ $first_comment_author = ! empty( $first_comment_author ) ? $first_comment_author : __( 'A WordPress Commenter' );
+ $first_comment_email = ! empty( $first_comment_email ) ? $first_comment_email : 'wapuu@wordpress.example';
+ $first_comment_url = ! empty( $first_comment_url ) ? $first_comment_url : 'https://wordpress.org/';
+ $first_comment = ! empty( $first_comment ) ? $first_comment : __( 'Hi, this is a comment.
To get started with moderating, editing, and deleting comments, please visit the Comments screen in the dashboard.
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,
@@ -217,17 +218,19 @@ Commenter avatars come from Gravatar.' );
));
// First Page
- $first_page = sprintf( __( "This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:
-
-Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my website. I live in Los Angeles, have a great dog named Jack, and I like piña coladas. (And gettin' caught in the rain.)
-
-...or something like this:
-
-The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.
-
-As a new WordPress user, you should go to your dashboard to delete this page and create new pages for your content. Have fun!" ), admin_url() );
if ( is_multisite() )
- $first_page = get_site_option( 'first_page', $first_page );
+ $first_page = get_site_option( 'first_page' );
+
+ $first_page = ! empty( $first_page ) ? $first_page : sprintf( __( "This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:
+
+ Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my website. I live in Los Angeles, have a great dog named Jack, and I like piña coladas. (And gettin' caught in the rain.)
+
+ ...or something like this:
+
+ The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.
+
+ As a new WordPress user, you should go to your dashboard to delete this page and create new pages for your content. Have fun!" ), admin_url() );
+
$first_post_guid = get_option('home') . '/?page_id=2';
$wpdb->insert( $wpdb->posts, array(
'post_author' => $user_id,
diff --git a/tests/phpunit/tests/multisite/wpInstallDefaults.php b/tests/phpunit/tests/multisite/wpInstallDefaults.php
new file mode 100644
index 0000000000..04db29e354
--- /dev/null
+++ b/tests/phpunit/tests/multisite/wpInstallDefaults.php
@@ -0,0 +1,81 @@
+factory->blog->create();
+
+ switch_to_blog( $blog_id );
+
+ $first_page = get_page_by_path( '/sample-page' );
+ $first_comment = get_comments();
+
+ restore_current_blog();
+ wpmu_delete_blog( $blog_id, true );
+
+ $this->assertNotEmpty( $first_page->post_content );
+ $this->assertNotEmpty( $first_comment[0]->comment_content );
+ }
+
+ /**
+ * @ticket 40036
+ */
+ public function test_empty_option_should_fall_back_to_default() {
+ /*
+ * Update first_page / first_comment options,
+ * just like what happens when the network settings page is saved
+ */
+ update_site_option( 'first_page', '' );
+ update_site_option( 'first_comment', '' );
+
+ $blog_id = $this->factory->blog->create();
+
+ switch_to_blog( $blog_id );
+
+ $first_page = get_page_by_path( '/sample-page' );
+ $first_comment = get_comments();
+
+ restore_current_blog();
+ wpmu_delete_blog( $blog_id, true );
+
+ $this->assertNotEmpty( $first_page->post_content );
+ $this->assertNotEmpty( $first_comment[0]->comment_content );
+ }
+
+ /**
+ * @ticket 40036
+ */
+ public function test_non_default_option_values() {
+ /*
+ * Update first_page / first_comment options,
+ * just like what happens when the network settings page is saved
+ */
+ update_site_option( 'first_page', 'Some page content' );
+ update_site_option( 'first_comment', 'Some comment content' );
+
+ $blog_id = $this->factory->blog->create();
+
+ switch_to_blog( $blog_id );
+
+ $first_page = get_page_by_path( '/sample-page' );
+ $first_comment = get_comments();
+
+ restore_current_blog();
+ wpmu_delete_blog( $blog_id, true );
+
+ $this->assertEquals( 'Some page content', $first_page->post_content );
+ $this->assertEquals( 'Some comment content', $first_comment[0]->comment_content );
+ }
+}
+
+endif;