<!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>[13638] trunk/wp-admin: Expose a read-only network.
php once multisite is enabled,
to ensure access to original configuration such as rewrite rules.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13638">13638</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-09 22:42:36 +0000 (Tue, 09 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Expose a read-only network.php once multisite is enabled, to ensure access to original configuration such as rewrite rules. see <a href="http://trac.wordpress.org/ticket/11816">#11816</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (13637 => 13638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2010-03-09 22:01:49 UTC (rev 13637)
+++ trunk/wp-admin/menu.php 2010-03-09 22:42:36 UTC (rev 13638)
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> $submenu['tools.php'][15] = array( __('Export'), 'import', 'export.php' );
</span><span class="cx"> if ( is_multisite() && ($current_blog->domain . $current_blog->path != $current_site->domain . $current_site->path) )
</span><span class="cx"> $submenu['tools.php'][25] = array( __('Delete Blog'), 'manage_options', 'ms-delete-site.php' );
</span><del>- if ( !is_multisite() && is_super_admin() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE )
</del><ins>+ if ( is_super_admin() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE )
</ins><span class="cx"> $submenu['tools.php'][50] = array(__('Network'), 'manage_options', 'network.php');
</span><span class="cx">
</span><span class="cx"> $menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top', 'menu-settings', 'div' );
</span></span></pre></div>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (13637 => 13638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-03-09 22:01:49 UTC (rev 13637)
+++ trunk/wp-admin/network.php 2010-03-09 22:42:36 UTC (rev 13638)
</span><span class="lines">@@ -16,9 +16,6 @@
</span><span class="cx"> if ( ! is_super_admin() )
</span><span class="cx"> wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
</span><span class="cx">
</span><del>-if ( is_multisite() )
- wp_die( __( 'The Network feature is already enabled.' ) );
-
</del><span class="cx"> include( ABSPATH . 'wp-admin/includes/network.php' );
</span><span class="cx">
</span><span class="cx"> // We need to create references to ms global tables to enable Network.
</span><span class="lines">@@ -171,13 +168,19 @@
</span><span class="cx"> */
</span><span class="cx"> function network_step2() {
</span><span class="cx"> global $base, $wpdb;
</span><del>- if ( ! $_POST ) : ?>
</del><ins>+ if ( ! $_POST ) :
+ if ( is_multisite() ) : ?>
+ <div class="updated"><p><strong><?php _e( 'Notice: The Network feature is already enabled.' ); ?></strong> <?php _e( 'The original configuration steps are shown here for reference.' ); ?></p></div>
+<?php else : ?>
</ins><span class="cx"> <div class="error"><p><strong><?php _e('Warning:'); ?></strong> <?php _e( 'An existing WordPress network was detected.' ); ?></p></div>
</span><span class="cx"> <p><?php _e( 'Please complete the configuration steps. To create a new network, you will need to empty or remove the network database tables.' ); ?></p>
</span><del>-<?php endif; ?>
</del><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><span class="cx"> <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>
</span><ins>+<?php
+ endif;
+ endif;
+?>
</ins><span class="cx"> <ol>
</span><span class="cx"> <li><p><?php printf( __( 'Create a <code>blogs.dir</code> directory in <code>%s</code>. This directory is used to stored uploaded media for your additional sites and must be writeable by the web server.' ), WP_CONTENT_DIR ); ?></p></li>
</span><span class="cx"> <li><p><?php printf( __( 'Add the following to your <code>wp-config.php</code> file in <code>%s</code>:' ), ABSPATH ); ?></p>
</span><span class="lines">@@ -250,8 +253,10 @@
</span><span class="cx"> <?php echo wp_htmledit_pre( $htaccess_file ); ?>
</span><span class="cx"> </textarea></li>
</span><span class="cx"> </ol>
</span><ins>+<?php if ( !is_multisite() ) { ?>
</ins><span class="cx"> <p><?php printf( __( 'Once you complete these steps, your network is enabled and configured.') ); ?> <a href="<?php echo esc_url( admin_url() ); ?>"><?php _e( 'Return to Dashboard' ); ?></a></p>
</span><span class="cx"> <?php
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $_POST ) {
</span><span class="lines">@@ -269,7 +274,7 @@
</span><span class="cx"> populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), $_POST['weblog_title'], $base, $vhost );
</span><span class="cx"> // create wp-config.php / htaccess
</span><span class="cx"> network_step2();
</span><del>-} elseif ( network_domain_check() ) {
</del><ins>+} elseif ( is_multisite() || network_domain_check() ) {
</ins><span class="cx"> network_step2();
</span><span class="cx"> } else {
</span><span class="cx"> network_step1();
</span></span></pre>
</div>
</div>
</body>
</html>