Ticket #34619: 34619.3.patch

src/wp-admin/includes/schema.php

@@ -983 +983 @@
                 'illegal_names' => array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', 'files' ),
                 'wpmu_upgrade_site' => $wp_db_version,
                 'welcome_email' => $welcome_email,
-                'first_post' => __( 'Welcome to <a href="SITE_URL">SITE_NAME</a>. This is your first post. Edit or delete it, then start blogging!' ),
+                /* translators: %s: site link */
+                'first_post' => __( 'Welcome to %s. This is your first post. Edit or delete it, then start blogging!' ),
                 // @todo - network admins should have a method of editing the network siteurl (used for cookie hash)
                 'siteurl' => get_option( 'siteurl' ) . '/',
                 'add_new_users' => '0',

src/wp-admin/includes/upgrade.php

@@ -155 +155 @@
         if ( is_multisite() ) {
                 $first_post = get_site_option( 'first_post' );
 
-                if ( empty($first_post) )
-                        $first_post = __( 'Welcome to <a href="SITE_URL">SITE_NAME</a>. This is your first post. Edit or delete it, then start writing!' );
+                if ( ! $first_post ) {
+                        /* translators: %s: site link */
+                        $first_post = __( 'Welcome to %s. This is your first post. Edit or delete it, then start blogging!' ),
+                }
 
-                $first_post = str_replace( "SITE_URL", esc_url( network_home_url() ), $first_post );
-                $first_post = str_replace( "SITE_NAME", get_current_site()->site_name, $first_post );
+                $first_post = sprintf( $first_post,
+                        sprintf( '<a href="%s">%s</a>', esc_url( network_home_url() ), get_current_site()->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_current_site()->site_name, $first_post );
         } else {
                 $first_post = __( 'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!' );
         }