Remove htaccess.ms and wp-config.ms templates. These were brought inline in [13611]. see #11816
git-svn-id: https://develop.svn.wordpress.org/trunk@13613 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin
parent
8b6b16cb2a
commit
3b13adaca8
|
|
@ -1,19 +0,0 @@
|
|||
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]
|
||||
|
||||
|
|
@ -1,107 +0,0 @@
|
|||
<?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');
|
||||
|
|
@ -84,8 +84,8 @@ function network_step1() {
|
|||
|
||||
wp_nonce_field( 'install-network-1' );
|
||||
if ( network_domain_check() ) { ?>
|
||||
<h2><?php esc_html_e( 'Existing Sites' ); ?></h2>
|
||||
<p><?php _e( 'An existing WordPress Network was detected.' ); ?></p>
|
||||
<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>
|
||||
<p class="existing-network">
|
||||
<label><input type='checkbox' name='existing_network' value='1' /> <?php _e( 'Yes, keep the existing network of sites.' ); ?></label><br />
|
||||
</p>
|
||||
|
|
|
|||
Loading…
Reference in New Issue