<!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>[13613] trunk/wp-admin: Remove htaccess.ms and wp-config.ms templates.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13613">13613</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-06 20:11:18 +0000 (Sat, 06 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove htaccess.ms and wp-config.ms templates. These were brought inline in <a href="http://trac.wordpress.org/changeset/13611">[13611]</a>. see <a href="http://trac.wordpress.org/ticket/11816">#11816</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwpadminincludeshtaccessms">trunk/wp-admin/includes/htaccess.ms</a></li>
<li><a href="#trunkwpadminincludeswpconfigms">trunk/wp-admin/includes/wp-config.ms</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludeshtaccessms"></a>
<div class="delfile"><h4>Deleted: trunk/wp-admin/includes/htaccess.ms (13612 => 13613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/htaccess.ms 2010-03-06 20:06:32 UTC (rev 13612)
+++ trunk/wp-admin/includes/htaccess.ms 2010-03-06 20:11:18 UTC (rev 13613)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>-RewriteEngine On
-RewriteBase BASE/
-
-#uploaded files
-RewriteRule ^(.*/)?files/$ index.php [L]
-RewriteCond %{REQUEST_URI} !.*wp-content/plugins.*
-RewriteRule ^(.*/)?files/(.*) wp-includes/ms-files.php?file=$2 [L]
-
-# add a trailing slash to /wp-admin
-RewriteCond %{REQUEST_URI} ^.*/wp-admin$
-RewriteRule ^(.+)$ $1/ [R=301,L]
-
-RewriteCond %{REQUEST_FILENAME} -f [OR]
-RewriteCond %{REQUEST_FILENAME} -d
-RewriteRule . - [L]
-RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L]
-RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]
-RewriteRule . index.php [L]
-
</del></span></pre></div>
<a id="trunkwpadminincludeswpconfigms"></a>
<div class="delfile"><h4>Deleted: trunk/wp-admin/includes/wp-config.ms (13612 => 13613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/wp-config.ms 2010-03-06 20:06:32 UTC (rev 13612)
+++ trunk/wp-admin/includes/wp-config.ms 2010-03-06 20:11:18 UTC (rev 13613)
</span><span class="lines">@@ -1,107 +0,0 @@
</span><del>-<?php
-/**
- * The base configuration of WordPress.
- *
- * This file has the following configurations: MySQL settings, Table Prefix,
- * Secret Keys, WordPress Language, and ABSPATH. You can find more information by
- * visiting {@link http://codex.wordpress.org/Editing_wp-config.php Editing
- * wp-config.php} Codex page. You can get the MySQL settings from your web host.
- *
- * This file is used by the wp-config.php creation script during the
- * installation.
- *
- * @package WordPress
- */
-
-// ** MySQL settings - You can get this info from your web host ** //
-/** The name of the database for WordPress */
-define('DB_NAME', 'wordpress');
-
-/** MySQL database username */
-define('DB_USER', 'username');
-
-/** MySQL database password */
-define('DB_PASSWORD', 'password');
-
-/** MySQL hostname */
-define('DB_HOST', 'localhost');
-
-/** Database Charset to use in creating database tables. */
-define('DB_CHARSET', 'utf8');
-
-/** The Database Collate type. Don't change this if in doubt. */
-define('DB_COLLATE', '');
-
-/** Network settings - added by the network settings installer */
-define('MULTISITE', true);
-define('VHOST', 'VHOSTSETTING');
-$base = 'BASE';
-define('DOMAIN_CURRENT_SITE', 'current_site_domain' );
-define('PATH_CURRENT_SITE', 'current_site_path' );
-define('SITE_ID_CURRENT_SITE', 1);
-define('BLOGID_CURRENT_SITE', '1' );
-
-/**#@+
- * Authentication Unique Keys.
- *
- * Change these to different unique phrases!
- * You can generate these using the {@link http://api.wordpress.org/secret-key/1.1/wpmu/salt WordPress.org secret-key service}
- * You can change these at any point in time to invalidate all existing cookies. This will force all users to have to log in again.
- *
- * @since 2.6.0
- */
-define('AUTH_KEY', 'put your unique phrase here');
-define('SECURE_AUTH_KEY', 'put your unique phrase here');
-define('LOGGED_IN_KEY', 'put your unique phrase here');
-define('NONCE_KEY', 'put your unique phrase here');
-define('AUTH_SALT', 'put your unique phrase here');
-define('LOGGED_IN_SALT', 'put your unique phrase here');
-define('SECURE_AUTH_SALT', 'put your unique phrase here');
-/**#@-*/
-
-/**
- * WordPress Database Table prefix.
- *
- * You can have multiple installations in one database if you give each a unique
- * prefix. Only numbers, letters, and underscores please!
- */
-$table_prefix = 'wp_';
-
-/**
- * WordPress Localized Language, defaults to English.
- *
- * Change this to localize WordPress. A corresponding MO file for the chosen
- * language must be installed to wp-content/languages. For example, install
- * de.mo to wp-content/languages and set WPLANG to 'de' to enable German
- * language support.
- */
-define ('WPLANG', '');
-
-// uncomment this to enable WP_CONTENT_DIR/sunrise.php support
-//define( 'SUNRISE', 'on' );
-
-// uncomment to move wp-content/blogs.dir to another relative path
-// remember to change WP_CONTENT too.
-// define( "UPLOADBLOGSDIR", "fileserver" );
-
-// If VHOST is 'yes' uncomment and set this to a URL to redirect if a blog does not exist or is a 404 on the main blog. (Useful if signup is disabled)
-// For example, the browser will redirect to http://examples.com/ for the following: define( 'NOBLOGREDIRECT', 'http://example.com/' );
-// Set this value to %siteurl% to redirect to the root of the site
-// define( 'NOBLOGREDIRECT', '' );
-// On a directory based install you must use the theme 404 handler.
-
-// Location of mu-plugins
-// define( 'WPMU_PLUGIN_DIR', '' );
-// define( 'WPMU_PLUGIN_URL', '' );
-// define( 'MUPLUGINDIR', 'wp-content/mu-plugins' );
-
-define( "WP_USE_MULTIPLE_DB", false );
-
-/* That's all, stop editing! Happy blogging. */
-
-/** Absolute path to the WordPress directory. */
-if ( !defined('ABSPATH') )
- define('ABSPATH', dirname(__FILE__) . '/');
-
-/** Sets up WordPress vars and included files. */
-require_once(ABSPATH . 'wp-settings.php');
</del></span></pre></div>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (13612 => 13613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-03-06 20:06:32 UTC (rev 13612)
+++ trunk/wp-admin/network.php 2010-03-06 20:11:18 UTC (rev 13613)
</span><span class="lines">@@ -84,8 +84,8 @@
</span><span class="cx">
</span><span class="cx"> wp_nonce_field( 'install-network-1' );
</span><span class="cx"> if ( network_domain_check() ) { ?>
</span><del>- <h2><?php esc_html_e( 'Existing Sites' ); ?></h2>
- <p><?php _e( 'An existing WordPress Network was detected.' ); ?></p>
</del><ins>+ <h3><?php esc_html_e( 'Existing Network' ); ?></h3>
+ <div class="updated inline"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'An existing network was detected.' ); ?></p></div>
</ins><span class="cx"> <p class="existing-network">
</span><span class="cx"> <label><input type='checkbox' name='existing_network' value='1' /> <?php _e( 'Yes, keep the existing network of sites.' ); ?></label><br />
</span><span class="cx"> </p>
</span></span></pre>
</div>
</div>
</body>
</html>