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

Don't tell IIS users to back up their .htaccess files. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@15024 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-05-28 02:41:01 +00:00
parent 554ef33c03
commit 52f9c18958
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wp-admin/network.php
View File

@ -307,7 +307,12 @@ function network_step2( $errors = false ) {
?> ?>
<h3><?php esc_html_e( 'Enabling the Network' ); ?></h3> <h3><?php esc_html_e( 'Enabling the Network' ); ?></h3>
<p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p> <p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p>
<div class="updated inline"><p><?php _e( '<strong>Caution:</strong> We recommend you backup your existing <code>wp-config.php</code> and <code>.htaccess</code> files.' ); ?></p></div> <div class="updated inline"><p><?php
if ( iis7_supports_permalinks() )
_e( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> file.' );
else
_e( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> and <code>.htaccess</code> files.' );
?></p></div>
<?php <?php
} }
?> ?>
@ -358,7 +363,8 @@ define( 'BLOG_ID_CURRENT_SITE', 1 );</textarea>
?> ?>
</li> </li>
<?php <?php
if ( iis7_supports_permalinks() ) { if ( iis7_supports_permalinks() ) :
if ( $subdomain_install ) { if ( $subdomain_install ) {
$web_config_file = $web_config_file =
'<?xml version="1.0" encoding="UTF-8"?> '<?xml version="1.0" encoding="UTF-8"?>
@ -440,8 +446,9 @@ define( 'BLOG_ID_CURRENT_SITE', 1 );</textarea>
<?php echo wp_htmledit_pre( $web_config_file ); ?> <?php echo wp_htmledit_pre( $web_config_file ); ?>
</textarea></li> </textarea></li>
</ol> </ol>
<?php } else {
// Construct an htaccess file. <?php else : // end iis7_supports_permalinks(). construct an htaccess file instead:
$htaccess_file = 'RewriteEngine On $htaccess_file = 'RewriteEngine On
RewriteBase ' . $base . ' RewriteBase ' . $base . '
RewriteRule ^index\.php$ - [L] RewriteRule ^index\.php$ - [L]
@ -469,7 +476,9 @@ RewriteRule ^ - [L]';
?> ?>
</textarea></li> </textarea></li>
</ol> </ol>
<?php }
<?php endif; // end IIS/Apache code branches.
if ( !is_multisite() ) { ?> if ( !is_multisite() ) { ?>
<p><?php printf( __( 'Once you complete these steps, your network is enabled and configured. You will have to log in again.') ); ?> <a href="<?php echo esc_url( site_url( 'wp-login.php' ) ); ?>"><?php _e( 'Log In' ); ?></a></p> <p><?php printf( __( 'Once you complete these steps, your network is enabled and configured. You will have to log in again.') ); ?> <a href="<?php echo esc_url( site_url( 'wp-login.php' ) ); ?>"><?php _e( 'Log In' ); ?></a></p>
<?php <?php