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
This commit is contained in:
parent
a65ce4e34b
commit
a5958a289b
|
@ -398,15 +398,15 @@ switch ( $step ) {
|
||||||
<?php
|
<?php
|
||||||
/* translators: %s: wp-config.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>' );
|
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>
|
</p>
|
||||||
<textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly">
|
<textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php echo $config_text; ?></textarea>
|
||||||
<?php
|
|
||||||
foreach ( $config_file as $line ) {
|
|
||||||
echo htmlentities( $line, ENT_COMPAT, 'UTF-8' );
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</textarea>
|
|
||||||
<p><?php _e( 'After you’ve done that, click “Run the installation.”' ); ?></p>
|
<p><?php _e( 'After you’ve done that, click “Run the installation.”' ); ?></p>
|
||||||
<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the installation' ); ?></a></p>
|
<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the installation' ); ?></a></p>
|
||||||
<script>
|
<script>
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @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.
|
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||||
|
|
Loading…
Reference in New Issue