From a5958a289b94b6e851fa1997152771d4ed4b5c80 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 8 Feb 2018 10:59:00 +0000
Subject: [PATCH] Upgrade/Install: Avoid extra line breaks in a textarea in
 `wp-admin/setup-config.php`.

See #43252.
Built from https://develop.svn.wordpress.org/trunk@42672


git-svn-id: http://core.svn.wordpress.org/trunk@42500 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/setup-config.php | 14 +++++++-------
 wp-includes/version.php   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php
index d746fd6c64..ce844e93e5 100644
--- a/wp-admin/setup-config.php
+++ b/wp-admin/setup-config.php
@@ -398,15 +398,15 @@ switch ( $step ) {
 <?php
 	/* translators: %s: wp-config.php */
 	printf( __( 'You can create the %s file manually and paste the following text into it.' ), '<code>wp-config.php</code>' );
+
+	$config_text = '';
+
+	foreach ( $config_file as $line ) {
+		$config_text .= htmlentities( $line, ENT_COMPAT, 'UTF-8' );
+	}
 ?>
 </p>
-<textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly">
-<?php
-foreach ( $config_file as $line ) {
-	echo htmlentities( $line, ENT_COMPAT, 'UTF-8' );
-}
-?>
-</textarea>
+<textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php echo $config_text; ?></textarea>
 <p><?php _e( 'After you&#8217;ve done that, click &#8220;Run the installation.&#8221;' ); ?></p>
 <p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the installation' ); ?></a></p>
 <script>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7a1f2502ea..a01238ec4e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-42671';
+$wp_version = '5.0-alpha-42672';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.