WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Networks and Sites: Remove extra whitespace in `.htaccess` rules on Network Setup page. 

Props riddhiehta02 for initial patch, sebastienserre, masterforwordpress.
Fixes #47062.
Built from https://develop.svn.wordpress.org/trunk@45390


git-svn-id: http://core.svn.wordpress.org/trunk@45201 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-05-23 23:28:53 +00:00
parent 239a159ad2
commit 139225ad7a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/includes/network.php
View File

@ -608,9 +608,9 @@ define('BLOG_ID_CURRENT_SITE', 1);
echo '<p><strong>' . __( 'Warning:' ) . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
}
?>
<textarea class="code" readonly="readonly" cols="100" rows="20"><?php echo esc_textarea( $web_config_file ); ?>
</textarea></li>
</ol>
<textarea class="code" readonly="readonly" cols="100" rows="20"><?php echo esc_textarea( $web_config_file ); ?></textarea>
</li>
</ol>
<?php
else : // end iis7_supports_permalinks(). construct an htaccess file instead:
@ -650,9 +650,9 @@ EOF;
echo '<p><strong>' . __( 'Warning:' ) . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
}
?>
<textarea class="code" readonly="readonly" cols="100" rows="<?php echo substr_count( $htaccess_file, "\n" ) + 1; ?>">
<?php echo esc_textarea( $htaccess_file ); ?></textarea></li>
</ol>
<textarea class="code" readonly="readonly" cols="100" rows="<?php echo substr_count( $htaccess_file, "\n" ) + 1; ?>"><?php echo esc_textarea( $htaccess_file ); ?></textarea>
</li>
</ol>
<?php
endif; // end IIS/Apache code branches.

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.3-alpha-45389';
$wp_version = '5.3-alpha-45390';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.