From a65ce4e34bec9ecccbb0fec06bcf80fc1263fed2 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 8 Feb 2018 10:58:31 +0000
Subject: [PATCH] Options: Avoid extra tabs in a textarea in
 `wp-admin/options.php`.

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


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

diff --git a/wp-admin/options.php b/wp-admin/options.php
index 2149102280..9705134174 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -290,12 +290,8 @@ foreach ( (array) $options as $option ) :
 <tr>
 	<th scope="row"><label for="<?php echo $name; ?>"><?php echo esc_html( $option->option_name ); ?></label></th>
 <td>
-<?php if ( strpos( $value, "\n" ) !== false ) : ?>
-	<textarea class="<?php echo $class; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>" cols="30" rows="5">
-								<?php
-								echo esc_textarea( $value );
-	?>
-	</textarea>
+	<?php if ( strpos( $value, "\n" ) !== false ) : ?>
+		<textarea class="<?php echo $class; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>" cols="30" rows="5"><?php echo esc_textarea( $value ); ?></textarea>
 	<?php else : ?>
 		<input class="regular-text <?php echo $class; ?>" type="text" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr( $value ); ?>"<?php disabled( $disabled, true ); ?> />
 	<?php endif ?></td>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a03b2d1357..7a1f2502ea 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-42670';
+$wp_version = '5.0-alpha-42671';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.