Changeset 40296

Timestamp:

03/17/2017 03:48:35 PM (8 years ago)

Author:

swissspidy

Message:

Multisite: Ensure first page/post/comment content is not empty when setting up a new site.

This prevents creating page without any content when the options are populated with an empty string.

Props shadyvb.
Fixes #40036.

Location:

trunk

Files:

• src/wp-admin/includes/upgrade.php (modified) (2 diffs)
• tests/phpunit/tests/multisite/wpInstallDefaults.php (added)

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

@@ -195 +195 @@
 
     // 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 <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 );
-    }
     $wpdb->insert( $wpdb->comments, array(
         'comment_post_ID' => 1,
@@ -218 +219 @@
 
     // 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:
-
-<blockquote>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&#241;a coladas. (And gettin' caught in the rain.)</blockquote>
-
-...or something like this:
-
-<blockquote>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.</blockquote>
-
-As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> 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:
+        
+        <blockquote>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&#241;a coladas. (And gettin' caught in the rain.)</blockquote>
+        
+        ...or something like this:
+        
+        <blockquote>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.</blockquote>
+        
+        As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> 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(