<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15024] trunk/wp-admin/network.php: Don't tell IIS users to back up their .
htaccess files.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15024">15024</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-28 02:41:01 +0000 (Fri, 28 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't tell IIS users to back up their .htaccess files.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (15023 => 15024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-05-28 02:36:49 UTC (rev 15023)
+++ trunk/wp-admin/network.php 2010-05-28 02:41:01 UTC (rev 15024)
</span><span class="lines">@@ -307,7 +307,12 @@
</span><span class="cx"> ?>
</span><span class="cx"> <h3><?php esc_html_e( 'Enabling the Network' ); ?></h3>
</span><span class="cx"> <p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="lines">@@ -358,7 +363,8 @@
</span><span class="cx"> ?>
</span><span class="cx"> </li>
</span><span class="cx"> <?php
</span><del>- if ( iis7_supports_permalinks() ) {
</del><ins>+ if ( iis7_supports_permalinks() ) :
+
</ins><span class="cx"> if ( $subdomain_install ) {
</span><span class="cx"> $web_config_file =
</span><span class="cx"> '<?xml version="1.0" encoding="UTF-8"?>
</span><span class="lines">@@ -440,8 +446,9 @@
</span><span class="cx"> <?php echo wp_htmledit_pre( $web_config_file ); ?>
</span><span class="cx"> </textarea></li>
</span><span class="cx"> </ol>
</span><del>- <?php } else {
- // Construct an htaccess file.
</del><ins>+
+ <?php else : // end iis7_supports_permalinks(). construct an htaccess file instead:
+
</ins><span class="cx"> $htaccess_file = 'RewriteEngine On
</span><span class="cx"> RewriteBase ' . $base . '
</span><span class="cx"> RewriteRule ^index\.php$ - [L]
</span><span class="lines">@@ -469,7 +476,9 @@
</span><span class="cx"> ?>
</span><span class="cx"> </textarea></li>
</span><span class="cx"> </ol>
</span><del>- <?php }
</del><ins>+
+ <?php endif; // end IIS/Apache code branches.
+
</ins><span class="cx"> if ( !is_multisite() ) { ?>
</span><span class="cx"> <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>
</span><span class="cx"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>