Ticket #45151: 45151.6.diff

wp-admin/includes/upgrade.php

@@ -147 +147 @@
         }
 
         $wpdb->insert( $wpdb->terms, array('term_id' => $cat_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
         $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $cat_id, 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
         $cat_tt_id = $wpdb->insert_id;
 
         // First post
         $now = current_time( 'mysql' );
         $now_gmt = current_time( 'mysql', 1 );
         $first_post_guid = get_option( 'home' ) . '/?p=1';
 
         if ( is_multisite() ) {
                 $first_post = get_site_option( 'first_post' );
 
                 if ( ! $first_post ) {
-                        /* translators: %s: site link */
-                        $first_post = __( '<!-- wp:paragraph -->
-<p>Welcome to %s. This is your first post. Edit or delete it, then start writing!</p>
-<!-- /wp:paragraph -->' );
+                        $first_post = "<!-- wp:paragraph -->\n<p>" .
+                                /* translators: %s: site link */
+                                __( 'Welcome to %s. This is your first post. Edit or delete it, then start writing!' ) .
+                                "</p>\n<!-- /wp:paragraph -->";
                 }
 
                 $first_post = sprintf( $first_post,
                         sprintf( '<a href="%s">%s</a>', esc_url( network_home_url() ), get_network()->site_name )
                 );
 
                 // Back-compat for pre-4.4
                 $first_post = str_replace( 'SITE_URL', esc_url( network_home_url() ), $first_post );
                 $first_post = str_replace( 'SITE_NAME', get_network()->site_name, $first_post );
         } else {
-                $first_post = __( '<!-- wp:paragraph -->
-<p>Welcome to WordPress. This is your first post. Edit or delete it, then start writing!</p>
-<!-- /wp:paragraph -->' );
+                $first_post = "<!-- wp:paragraph -->\n<p>" .
+                        __( 'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!' ) .
+                        "</p>\n<!-- /wp:paragraph -->";
         }
 
         $wpdb->insert( $wpdb->posts, array(
                 'post_author' => $user_id,
                 'post_date' => $now,
                 'post_date_gmt' => $now_gmt,
                 'post_content' => $first_post,
                 'post_excerpt' => '',
                 'post_title' => __('Hello world!'),
                 /* translators: Default post slug */
                 'post_name' => sanitize_title( _x('hello-world', 'Default post slug') ),
                 'post_modified' => $now,
                 'post_modified_gmt' => $now_gmt,
                 'guid' => $first_post_guid,
                 'comment_count' => 1,
@@ -213 +213 @@
 Commenter avatars come from <a href="https://gravatar.com">Gravatar</a>.' );
         $wpdb->insert( $wpdb->comments, array(
                 'comment_post_ID' => 1,
                 'comment_author' => $first_comment_author,
                 'comment_author_email' => $first_comment_email,
                 'comment_author_url' => $first_comment_url,
                 'comment_date' => $now,
                 'comment_date_gmt' => $now_gmt,
                 'comment_content' => $first_comment
         ));
 
         // First Page
         if ( is_multisite() )
                 $first_page = get_site_option( 'first_page' );
 
-        $first_page = ! empty( $first_page ) ? $first_page : sprintf( __( "<!-- wp:paragraph -->
-<p>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:</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:quote -->
-<blockquote class=\"wp-block-quote\"><p>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.)</p></blockquote>
-<!-- /wp:quote -->
-
-<!-- wp:paragraph -->
-<p>...or something like this:</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:quote -->
-<blockquote class=\"wp-block-quote\"><p>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.</p></blockquote>
-<!-- /wp:quote -->
-
-<!-- wp:paragraph -->
-<p>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!</p>
-<!-- /wp:paragraph -->" ), admin_url() );
+        if ( empty( $first_page ) ) {
+                $first_page = "<!-- wp:paragraph -->\n<p>";
+                $first_page .= __( "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:" );
+                $first_page .= "</p>\n<!-- /wp:paragraph -->\n\n";
+
+                $first_page .= "<!-- wp:quote -->\n<blockquote class=\"wp-block-quote\"><p>";
+                $first_page .= __( "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.)" );
+                $first_page .= "</p></blockquote>\n<!-- /wp:quote -->\n\n";
+
+                $first_page .= "<!-- wp:paragraph -->\n<p>";
+                $first_page .= __( '...or something like this:' );
+                $first_page .= "</p>\n<!-- /wp:paragraph -->\n\n";
+
+                $first_page .= "<!-- wp:quote -->\n<blockquote class=\"wp-block-quote\"><p>";
+                $first_page .= __( '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.' );
+                $first_page .= "</p></blockquote>\n<!-- /wp:quote -->\n\n";
+
+                $first_page .= "<!-- wp:paragraph -->\n<p>";
+                $first_page .= sprintf(
+                        /* translators: %s:  Site admin URL */
+                        __( '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_page .= "</p>\n<!-- /wp:paragraph -->";
+        }
 
         $first_post_guid = get_option('home') . '/?page_id=2';
         $wpdb->insert( $wpdb->posts, array(
                 'post_author' => $user_id,
                 'post_date' => $now,
                 'post_date_gmt' => $now_gmt,
                 'post_content' => $first_page,
                 'post_excerpt' => '',
                 'comment_status' => 'closed',
                 'post_title' => __( 'Sample Page' ),
                 /* translators: Default page slug */
                 'post_name' => __( 'sample-page' ),
                 'post_modified' => $now,
                 'post_modified_gmt' => $now_gmt,
                 'guid' => $first_post_guid,