<!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>[16272] trunk/wp-admin/network: Network admin multisite checks and docs.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16272">16272</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-11-10 14:27:15 +0000 (Wed, 10 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Network admin multisite checks and docs. see <a href="http://trac.wordpress.org/ticket/14435">#14435</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworkadminphp">trunk/wp-admin/network/admin.php</a></li>
<li><a href="#trunkwpadminnetworkeditphp">trunk/wp-admin/network/edit.php</a></li>
<li><a href="#trunkwpadminnetworkindexextraphp">trunk/wp-admin/network/index-extra.php</a></li>
<li><a href="#trunkwpadminnetworkindexphp">trunk/wp-admin/network/index.php</a></li>
<li><a href="#trunkwpadminnetworkmenuphp">trunk/wp-admin/network/menu.php</a></li>
<li><a href="#trunkwpadminnetworkplugineditorphp">trunk/wp-admin/network/plugin-editor.php</a></li>
<li><a href="#trunkwpadminnetworkplugininstallphp">trunk/wp-admin/network/plugin-install.php</a></li>
<li><a href="#trunkwpadminnetworkpluginsphp">trunk/wp-admin/network/plugins.php</a></li>
<li><a href="#trunkwpadminnetworkprofilephp">trunk/wp-admin/network/profile.php</a></li>
<li><a href="#trunkwpadminnetworksettingsphp">trunk/wp-admin/network/settings.php</a></li>
<li><a href="#trunkwpadminnetworksiteinfophp">trunk/wp-admin/network/site-info.php</a></li>
<li><a href="#trunkwpadminnetworksitenewphp">trunk/wp-admin/network/site-new.php</a></li>
<li><a href="#trunkwpadminnetworksiteoptionsphp">trunk/wp-admin/network/site-options.php</a></li>
<li><a href="#trunkwpadminnetworksitethemesphp">trunk/wp-admin/network/site-themes.php</a></li>
<li><a href="#trunkwpadminnetworksiteusersphp">trunk/wp-admin/network/site-users.php</a></li>
<li><a href="#trunkwpadminnetworksitesphp">trunk/wp-admin/network/sites.php</a></li>
<li><a href="#trunkwpadminnetworkthemeeditorphp">trunk/wp-admin/network/theme-editor.php</a></li>
<li><a href="#trunkwpadminnetworkthemeinstallphp">trunk/wp-admin/network/theme-install.php</a></li>
<li><a href="#trunkwpadminnetworkthemesphp">trunk/wp-admin/network/themes.php</a></li>
<li><a href="#trunkwpadminnetworkupdatecorephp">trunk/wp-admin/network/update-core.php</a></li>
<li><a href="#trunkwpadminnetworkupdatephp">trunk/wp-admin/network/update.php</a></li>
<li><a href="#trunkwpadminnetworkupgradephp">trunk/wp-admin/network/upgrade.php</a></li>
<li><a href="#trunkwpadminnetworkusereditphp">trunk/wp-admin/network/user-edit.php</a></li>
<li><a href="#trunkwpadminnetworkusernewphp">trunk/wp-admin/network/user-new.php</a></li>
<li><a href="#trunkwpadminnetworkusersphp">trunk/wp-admin/network/users.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnetworkadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/admin.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/admin.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/admin.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -3,13 +3,14 @@
</span><span class="cx"> * WordPress Network Administration Bootstrap
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @subpackage Administration
</del><ins>+ * @subpackage Multisite
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx">
</span><del>-define('WP_NETWORK_ADMIN', TRUE);
</del><ins>+define( 'WP_NETWORK_ADMIN', TRUE );
</ins><span class="cx">
</span><del>-require_once( dirname(dirname(__FILE__)) . '/admin.php');
</del><ins>+/** Load WordPress Administration Bootstrap */
+require_once( dirname( dirname( __FILE__ ) ) . '/admin.php' );
</ins><span class="cx">
</span><span class="cx"> if ( ! is_multisite() )
</span><span class="cx"> wp_die( __( 'Multisite support is not enabled.' ) );
</span></span></pre></div>
<a id="trunkwpadminnetworkeditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/edit.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/edit.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/edit.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+/** Load WordPress Administration Bootstrap */
</ins><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><span class="cx"> if ( ! is_multisite() )
</span></span></pre></div>
<a id="trunkwpadminnetworkindexextraphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/index-extra.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/index-extra.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/index-extra.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -3,10 +3,11 @@
</span><span class="cx"> * Handle default network dashboard widgets options AJAX.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @subpackage Administration
</del><ins>+ * @subpackage Multisite
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+/** Load WordPress Administration Bootstrap */
</ins><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><span class="cx"> require( '../index-extra.php' );
</span></span></pre></div>
<a id="trunkwpadminnetworkindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/index.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/index.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/index.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -7,11 +7,11 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><span class="cx">
</span><del>-/** Load WordPress Bootstrap */
</del><ins>+/** Load WordPress Administration Bootstrap */
</ins><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><span class="cx"> /** Load WordPress dashboard API */
</span><del>-require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
</del><ins>+require_once( ABSPATH . 'wp-admin/includes/dashboard.php' );
</ins><span class="cx">
</span><span class="cx"> if ( !is_multisite() )
</span><span class="cx"> wp_die( __( 'Multisite support is not enabled.' ) );
</span></span></pre></div>
<a id="trunkwpadminnetworkmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/menu.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/menu.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/menu.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> * Build Network Administration Menu.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @subpackage Administration
</del><ins>+ * @subpackage Multisite
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworkplugineditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/plugin-editor.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/plugin-editor.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/plugin-editor.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -3,10 +3,14 @@
</span><span class="cx"> * Plugin editor network administration panel.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @subpackage Administration
</del><ins>+ * @subpackage Multisite
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+/** Load WordPress Administration Bootstrap */
</ins><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><ins>+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
</ins><span class="cx"> require( '../plugin-editor.php' );
</span></span></pre></div>
<a id="trunkwpadminnetworkplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/plugin-install.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/plugin-install.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/plugin-install.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -3,10 +3,14 @@
</span><span class="cx"> * Install plugin network administration panel.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @subpackage Administration
</del><ins>+ * @subpackage Multisite
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+/** Load WordPress Administration Bootstrap */
</ins><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><ins>+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
</ins><span class="cx"> require( '../plugin-install.php' );
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminnetworkpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/plugins.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/plugins.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/plugins.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -3,10 +3,14 @@
</span><span class="cx"> * Network Plugins administration panel.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @subpackage Administration
</del><ins>+ * @subpackage Multisite
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+/** Load WordPress Administration Bootstrap */
</ins><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><ins>+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
</ins><span class="cx"> require( '../plugins.php' );
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminnetworkprofilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/profile.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/profile.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/profile.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -3,10 +3,14 @@
</span><span class="cx"> * User profile network administration panel.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @subpackage Administration
</del><ins>+ * @subpackage Multisite
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+/** Load WordPress Administration Bootstrap */
</ins><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><ins>+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
</ins><span class="cx"> require( '../profile.php' );
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminnetworksettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/settings.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/settings.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/settings.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+/** Load WordPress Administration Bootstrap */
</ins><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><span class="cx"> if ( ! is_multisite() )
</span></span></pre></div>
<a id="trunkwpadminnetworksiteinfophp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-info.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-info.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/site-info.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -1,15 +1,14 @@
</span><span class="cx"> <?php
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * Edit Site Info Administration Screen
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @subpackage Administration
</del><ins>+ * @subpackage Multisite
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /** Load WordPress Administration Bootstrap */
</span><del>-require_once('./admin.php');
</del><ins>+require_once( './admin.php' );
</ins><span class="cx">
</span><span class="cx"> if ( ! is_multisite() )
</span><span class="cx"> wp_die( __( 'Multisite support is not enabled.' ) );
</span></span></pre></div>
<a id="trunkwpadminnetworksitenewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-new.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-new.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/site-new.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -1,15 +1,14 @@
</span><span class="cx"> <?php
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * Add Site Administration Screen
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @subpackage Administration
</del><ins>+ * @subpackage Multisite
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /** Load WordPress Administration Bootstrap */
</span><del>-require_once('./admin.php');
</del><ins>+require_once( './admin.php' );
</ins><span class="cx">
</span><span class="cx"> if ( ! is_multisite() )
</span><span class="cx"> wp_die( __( 'Multisite support is not enabled.' ) );
</span></span></pre></div>
<a id="trunkwpadminnetworksiteoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-options.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-options.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/site-options.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -1,15 +1,14 @@
</span><span class="cx"> <?php
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * Edit Site Options Administration Screen
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @subpackage Administration
</del><ins>+ * @subpackage Multisite
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /** Load WordPress Administration Bootstrap */
</span><del>-require_once('./admin.php');
</del><ins>+require_once( './admin.php' );
</ins><span class="cx">
</span><span class="cx"> if ( ! is_multisite() )
</span><span class="cx"> wp_die( __( 'Multisite support is not enabled.' ) );
</span></span></pre></div>
<a id="trunkwpadminnetworksitethemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-themes.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-themes.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/site-themes.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -3,12 +3,16 @@
</span><span class="cx"> * Edit Site Themes Administration Screen
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @subpackage Administration
</del><ins>+ * @subpackage Multisite
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+/** Load WordPress Administration Bootstrap */
</ins><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><ins>+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
</ins><span class="cx"> $wp_list_table = get_list_table('WP_MS_Themes_List_Table');
</span><span class="cx"> $wp_list_table->check_permissions();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-users.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-users.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/site-users.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -1,15 +1,14 @@
</span><span class="cx"> <?php
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * Edit Site Users Administration Screen
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @subpackage Administration
</del><ins>+ * @subpackage Multisite
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /** Load WordPress Administration Bootstrap */
</span><del>-require_once('./admin.php');
</del><ins>+require_once( './admin.php' );
</ins><span class="cx">
</span><span class="cx"> if ( ! is_multisite() )
</span><span class="cx"> wp_die( __( 'Multisite support is not enabled.' ) );
</span></span></pre></div>
<a id="trunkwpadminnetworksitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/sites.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/sites.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/sites.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+/** Load WordPress Administration Bootstrap */
</ins><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><span class="cx"> if ( ! is_multisite() )
</span></span></pre></div>
<a id="trunkwpadminnetworkthemeeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/theme-editor.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/theme-editor.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/theme-editor.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -3,10 +3,14 @@
</span><span class="cx"> * Theme editor network administration panel.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @subpackage Administration
</del><ins>+ * @subpackage Multisite
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+/** Load WordPress Administration Bootstrap */
</ins><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><ins>+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
</ins><span class="cx"> require( '../theme-editor.php' );
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminnetworkthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/theme-install.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/theme-install.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/theme-install.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -3,10 +3,14 @@
</span><span class="cx"> * Install theme network administration panel.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @subpackage Administration
</del><ins>+ * @subpackage Multisite
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+/** Load WordPress Administration Bootstrap */
</ins><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><ins>+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
</ins><span class="cx"> require( '../theme-install.php' );
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminnetworkthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/themes.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/themes.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/themes.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -7,8 +7,12 @@
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+/** Load WordPress Administration Bootstrap */
</ins><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><ins>+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
</ins><span class="cx"> $wp_list_table = get_list_table('WP_MS_Themes_List_Table');
</span><span class="cx"> $wp_list_table->check_permissions();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworkupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/update-core.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/update-core.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/update-core.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> <?php
</span><ins>+/**
+ * Updates network administration panel.
+ *
+ * @package WordPress
+ * @subpackage Multisite
+ * @since 3.1.0
+ */
</ins><span class="cx">
</span><ins>+/** Load WordPress Administration Bootstrap */
</ins><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><ins>+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
</ins><span class="cx"> require( '../update-core.php' );
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminnetworkupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/update.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/update.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/update.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -3,10 +3,14 @@
</span><span class="cx"> * Update/Install Plugin/Theme network administration panel.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @subpackage Administration
</del><ins>+ * @subpackage Multisite
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+/** Load WordPress Administration Bootstrap */
</ins><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><ins>+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
</ins><span class="cx"> require( '../update.php' );
</span></span></pre></div>
<a id="trunkwpadminnetworkupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/upgrade.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/upgrade.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/upgrade.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -7,9 +7,10 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><span class="cx">
</span><del>-require_once('./admin.php');
</del><ins>+/** Load WordPress Administration Bootstrap */
+require_once( './admin.php' );
</ins><span class="cx">
</span><del>-if ( !is_multisite() )
</del><ins>+if ( ! is_multisite() )
</ins><span class="cx"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx">
</span><span class="cx"> require_once( ABSPATH . WPINC . '/http.php' );
</span></span></pre></div>
<a id="trunkwpadminnetworkusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/user-edit.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/user-edit.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/user-edit.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -3,10 +3,14 @@
</span><span class="cx"> * Edit user network administration panel.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @subpackage Administration
</del><ins>+ * @subpackage Multisite
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+/** Load WordPress Administration Bootstrap */
</ins><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><ins>+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
</ins><span class="cx"> require( '../user-edit.php' );
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminnetworkusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/user-new.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/user-new.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/user-new.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -1,15 +1,14 @@
</span><span class="cx"> <?php
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * Add Site Administration Screen
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @subpackage Administration
</del><ins>+ * @subpackage Multisite
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /** Load WordPress Administration Bootstrap */
</span><del>-require_once('./admin.php');
</del><ins>+require_once( './admin.php' );
</ins><span class="cx">
</span><span class="cx"> if ( ! is_multisite() )
</span><span class="cx"> wp_die( __( 'Multisite support is not enabled.' ) );
</span></span></pre></div>
<a id="trunkwpadminnetworkusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/users.php (16271 => 16272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/users.php 2010-11-10 14:01:39 UTC (rev 16271)
+++ trunk/wp-admin/network/users.php 2010-11-10 14:27:15 UTC (rev 16272)
</span><span class="lines">@@ -7,8 +7,12 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+/** Load WordPress Administration Bootstrap */
</ins><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><ins>+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
</ins><span class="cx"> $wp_list_table = get_list_table('WP_MS_Users_List_Table');
</span><span class="cx"> $wp_list_table->check_permissions();
</span><span class="cx"> $wp_list_table->prepare_items();
</span><span class="lines">@@ -72,6 +76,8 @@
</span><span class="cx"> ?>
</span><span class="cx"> </h2>
</span><span class="cx">
</span><ins>+ <?php $wp_list_table->views(); ?>
+
</ins><span class="cx"> <form action="" method="get" class="search-form">
</span><span class="cx"> <p class="search-box">
</span><span class="cx"> <input type="text" name="s" value="<?php echo esc_attr( $usersearch ); ?>" class="search-input" id="user-search-input" />
</span></span></pre>
</div>
</div>
</body>
</html>