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

Add line breaks at the end of network setup rules to avoid unintended merging with a subsequent line. 

props socki03.
fixes #29945.
Built from https://develop.svn.wordpress.org/trunk@29899


git-svn-id: http://core.svn.wordpress.org/trunk@29654 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2014-10-15 14:13:20 +00:00
parent f19ad10571
commit 320ee24a55
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/network.php
View File

@ -383,13 +383,14 @@ function network_step2( $errors = false ) {
?> ?>
<ol> <ol>
<li><p><?php printf( __( 'Add the following to your <code>wp-config.php</code> file in <code>%s</code> <strong>above</strong> the line reading <code>/* That&#8217;s all, stop editing! Happy blogging. */</code>:' ), $location_of_wp_config ); ?></p> <li><p><?php printf( __( 'Add the following to your <code>wp-config.php</code> file in <code>%s</code> <strong>above</strong> the line reading <code>/* That&#8217;s all, stop editing! Happy blogging. */</code>:' ), $location_of_wp_config ); ?></p>
<textarea class="code" readonly="readonly" cols="100" rows="6"> <textarea class="code" readonly="readonly" cols="100" rows="7">
define('MULTISITE', true); define('MULTISITE', true);
define('SUBDOMAIN_INSTALL', <?php echo $subdomain_install ? 'true' : 'false'; ?>); define('SUBDOMAIN_INSTALL', <?php echo $subdomain_install ? 'true' : 'false'; ?>);
define('DOMAIN_CURRENT_SITE', '<?php echo $hostname; ?>'); define('DOMAIN_CURRENT_SITE', '<?php echo $hostname; ?>');
define('PATH_CURRENT_SITE', '<?php echo $base; ?>'); define('PATH_CURRENT_SITE', '<?php echo $base; ?>');
define('SITE_ID_CURRENT_SITE', 1); define('SITE_ID_CURRENT_SITE', 1);
define('BLOG_ID_CURRENT_SITE', 1);</textarea> define('BLOG_ID_CURRENT_SITE', 1);
</textarea>
<?php <?php
$keys_salts = array( 'AUTH_KEY' => '', 'SECURE_AUTH_KEY' => '', 'LOGGED_IN_KEY' => '', 'NONCE_KEY' => '', 'AUTH_SALT' => '', 'SECURE_AUTH_SALT' => '', 'LOGGED_IN_SALT' => '', 'NONCE_SALT' => '' ); $keys_salts = array( 'AUTH_KEY' => '', 'SECURE_AUTH_KEY' => '', 'LOGGED_IN_KEY' => '', 'NONCE_KEY' => '', 'AUTH_SALT' => '', 'SECURE_AUTH_SALT' => '', 'LOGGED_IN_SALT' => '', 'NONCE_SALT' => '' );
foreach ( $keys_salts as $c => $v ) { foreach ( $keys_salts as $c => $v ) {
@ -470,7 +471,8 @@ define('BLOG_ID_CURRENT_SITE', 1);</textarea>
</rules> </rules>
</rewrite> </rewrite>
</system.webServer> </system.webServer>
</configuration>'; </configuration>
';
echo '<li><p>'; echo '<li><p>';
/* translators: 1: a filename like .htaccess. 2: a file path. */ /* translators: 1: a filename like .htaccess. 2: a file path. */
@ -506,6 +508,7 @@ RewriteRule ^ - [L]
RewriteRule ^{$subdir_match}(wp-(content|admin|includes).*) {$rewrite_base}{$subdir_replacement_12} [L] RewriteRule ^{$subdir_match}(wp-(content|admin|includes).*) {$rewrite_base}{$subdir_replacement_12} [L]
RewriteRule ^{$subdir_match}(.*\.php)$ {$rewrite_base}$subdir_replacement_12 [L] RewriteRule ^{$subdir_match}(.*\.php)$ {$rewrite_base}$subdir_replacement_12 [L]
RewriteRule . index.php [L] RewriteRule . index.php [L]
EOF; EOF;
echo '<li><p>'; echo '<li><p>';