<!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>[16672] trunk/wp-admin/network.php: Network setup fixes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16672">16672</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-12-01 21:32:40 +0000 (Wed, 01 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Network setup fixes. Props wpdavis. fixes <a href="http://trac.wordpress.org/ticket/15620">#15620</a></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 (16671 => 16672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-12-01 20:48:52 UTC (rev 16671)
+++ trunk/wp-admin/network.php 2010-12-01 21:32:40 UTC (rev 16672)
</span><span class="lines">@@ -137,14 +137,14 @@
</span><span class="cx"> if ( get_option( 'siteurl' ) != get_option( 'home' ) ) {
</span><span class="cx"> echo '<div class="error"><p><strong>' . __('Error:') . '</strong> ' . sprintf( __( 'Your <strong>WordPress address</strong> must match your <strong>Site address</strong> before creating a Network. See <a href="%s">General Settings</a>.' ), esc_url( admin_url( 'options-general.php' ) ) ) . '</p></div>';
</span><span class="cx"> echo '</div>';
</span><del>- include ('./admin-footer.php' );
</del><ins>+ include ( ABSPATH . 'wp-admin/admin-footer.php' );
</ins><span class="cx"> die();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) {
</span><span class="cx"> echo '<div class="error"><p><strong>' . __('Error:') . '</strong> ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '</p></div>';
</span><span class="cx"> echo '</div>';
</span><del>- include ('./admin-footer.php' );
</del><ins>+ include ( ABSPATH . 'wp-admin/admin-footer.php' );
</ins><span class="cx"> die();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> if ( ! empty( $active_plugins ) ) {
</span><span class="cx"> echo '<div class="updated"><p><strong>' . __('Warning:') . '</strong> ' . sprintf( __( 'Please <a href="%s">deactivate your plugins</a> before enabling the Network feature.' ), admin_url( 'plugins.php?plugin_status=active' ) ) . '</p></div><p>' . __( 'Once the network is created, you may reactivate your plugins.' ) . '</p>';
</span><span class="cx"> echo '</div>';
</span><del>- include( './admin-footer.php' );
</del><ins>+ include( ABSPATH . 'wp-admin/admin-footer.php' );
</ins><span class="cx"> die();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> echo '<p>' . sprintf( __( 'You cannot use port numbers such as <code>%s</code>.' ), $has_ports ) . '</p>';
</span><span class="cx"> echo '<a href="' . esc_url( admin_url() ) . '">' . __( 'Return to Dashboard' ) . '</a>';
</span><span class="cx"> echo '</div>';
</span><del>- include( './admin-footer.php' );
</del><ins>+ include( ABSPATH . 'wp-admin/admin-footer.php' );
</ins><span class="cx"> die();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -511,9 +511,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$base = trailingslashit( stripslashes( dirname( dirname( $_SERVER['SCRIPT_NAME'] ) ) ) );
</del><ins>+if ( $_POST ) {
</ins><span class="cx">
</span><del>-if ( $_POST ) {
</del><ins>+ $base = trailingslashit( stripslashes( dirname( dirname( $_SERVER['SCRIPT_NAME'] ) ) ) );
+
</ins><span class="cx"> check_admin_referer( 'install-network-1' );
</span><span class="cx">
</span><span class="cx"> require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
</span></span></pre>
</div>
</div>
</body>
</html>