Network admin multisite checks and docs. see #14435.

git-svn-id: http://svn.automattic.com/wordpress/trunk@16272 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2024-09-24 21:32:51 +02:00 · 2010-11-10 14:27:15 +00:00 · 2010-11-10 14:27:15 +00:00 · f269b75d7b
commit f269b75d7b
parent a1c4c4789f
25 changed files with 91 additions and 33 deletions
--- a/wp-admin/network/admin.php
+++ b/wp-admin/network/admin.php
@ -3,13 +3,14 @@
 * WordPress Network Administration Bootstrap
 *
 * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
 * @since 3.1.0
 */

-define('WP_NETWORK_ADMIN', TRUE);
+define( 'WP_NETWORK_ADMIN', TRUE );

-require_once( dirname(dirname(__FILE__)) . '/admin.php');
+/** Load WordPress Administration Bootstrap */
+require_once( dirname( dirname( __FILE__ ) ) . '/admin.php' );

 if ( ! is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
--- a/wp-admin/network/edit.php
+++ b/wp-admin/network/edit.php
@ -7,6 +7,7 @@
 * @since 3.0.0
 */

+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );

 if ( ! is_multisite() )
--- a/wp-admin/network/index-extra.php
+++ b/wp-admin/network/index-extra.php
@ -3,10 +3,11 @@
 * Handle default network dashboard widgets options AJAX.
 *
 * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
 * @since 3.1.0
 */

+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );

 require( '../index-extra.php' );
--- a/wp-admin/network/index.php
+++ b/wp-admin/network/index.php
@ -7,11 +7,11 @@
 * @since 3.0.0
 */

-/** Load WordPress Bootstrap */
+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );

 /** Load WordPress dashboard API */
-require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
+require_once( ABSPATH . 'wp-admin/includes/dashboard.php' );

 if ( !is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
--- a/wp-admin/network/menu.php
+++ b/wp-admin/network/menu.php
@ -3,7 +3,7 @@
 * Build Network Administration Menu.
 *
 * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
 * @since 3.1.0
 */

--- a/wp-admin/network/plugin-editor.php
+++ b/wp-admin/network/plugin-editor.php
@ -3,10 +3,14 @@
 * Plugin editor network administration panel.
 *
 * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
 * @since 3.1.0
 */

+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );

+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 require( '../plugin-editor.php' );
--- a/wp-admin/network/plugin-install.php
+++ b/wp-admin/network/plugin-install.php
@ -3,10 +3,14 @@
 * Install plugin network administration panel.
 *
 * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
 * @since 3.1.0
 */

+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );

+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 require( '../plugin-install.php' );
--- a/wp-admin/network/plugins.php
+++ b/wp-admin/network/plugins.php
@ -3,10 +3,14 @@
 * Network Plugins administration panel.
 *
 * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
 * @since 3.1.0
 */

+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );

+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 require( '../plugins.php' );
--- a/wp-admin/network/profile.php
+++ b/wp-admin/network/profile.php
@ -3,10 +3,14 @@
 * User profile network administration panel.
 *
 * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
 * @since 3.1.0
 */

+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );

+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 require( '../profile.php' );
--- a/wp-admin/network/settings.php
+++ b/wp-admin/network/settings.php
@ -7,6 +7,7 @@
 * @since 3.0.0
 */

+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );

 if ( ! is_multisite() )
--- a/wp-admin/network/site-info.php
+++ b/wp-admin/network/site-info.php
@ -1,15 +1,14 @@
 <?php
-
 /**
 * Edit Site Info Administration Screen
 *
 * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
 * @since 3.1.0
 */

 /** Load WordPress Administration Bootstrap */
-require_once('./admin.php');
+require_once( './admin.php' );

 if ( ! is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
--- a/wp-admin/network/site-new.php
+++ b/wp-admin/network/site-new.php
@ -1,15 +1,14 @@
 <?php
-
 /**
 * Add Site Administration Screen
 *
 * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
 * @since 3.1.0
 */

 /** Load WordPress Administration Bootstrap */
-require_once('./admin.php');
+require_once( './admin.php' );

 if ( ! is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
--- a/wp-admin/network/site-options.php
+++ b/wp-admin/network/site-options.php
@ -1,15 +1,14 @@
 <?php
-
 /**
 * Edit Site Options Administration Screen
 *
 * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
 * @since 3.1.0
 */

 /** Load WordPress Administration Bootstrap */
-require_once('./admin.php');
+require_once( './admin.php' );

 if ( ! is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
--- a/wp-admin/network/site-themes.php
+++ b/wp-admin/network/site-themes.php
@ -3,12 +3,16 @@
 * Edit Site Themes Administration Screen
 *
 * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
 * @since 3.1.0
 */

+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );

+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 $wp_list_table = get_list_table('WP_MS_Themes_List_Table');
 $wp_list_table->check_permissions();

--- a/wp-admin/network/site-users.php
+++ b/wp-admin/network/site-users.php
@ -1,15 +1,14 @@
 <?php
-
 /**
 * Edit Site Users Administration Screen
 *
 * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
 * @since 3.1.0
 */

 /** Load WordPress Administration Bootstrap */
-require_once('./admin.php');
+require_once( './admin.php' );

 if ( ! is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
--- a/wp-admin/network/sites.php
+++ b/wp-admin/network/sites.php
@ -7,6 +7,7 @@
 * @since 3.0.0
 */

+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );

 if ( ! is_multisite() )
--- a/wp-admin/network/theme-editor.php
+++ b/wp-admin/network/theme-editor.php
@ -3,10 +3,14 @@
 * Theme editor network administration panel.
 *
 * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
 * @since 3.1.0
 */

+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );

+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 require( '../theme-editor.php' );
--- a/wp-admin/network/theme-install.php
+++ b/wp-admin/network/theme-install.php
@ -3,10 +3,14 @@
 * Install theme network administration panel.
 *
 * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
 * @since 3.1.0
 */

+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );

+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 require( '../theme-install.php' );
--- a/wp-admin/network/themes.php
+++ b/wp-admin/network/themes.php
@ -7,8 +7,12 @@
 * @since 3.1.0
 */

+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );

+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 $wp_list_table = get_list_table('WP_MS_Themes_List_Table');
 $wp_list_table->check_permissions();

--- a/wp-admin/network/update-core.php
+++ b/wp-admin/network/update-core.php
@ -1,5 +1,16 @@
 <?php
+/**
+ * Updates network administration panel.
+ *
+ * @package WordPress
+ * @subpackage Multisite
+ * @since 3.1.0
+ */

+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );

+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 require( '../update-core.php' );
--- a/wp-admin/network/update.php
+++ b/wp-admin/network/update.php
@ -3,10 +3,14 @@
 * Update/Install Plugin/Theme network administration panel.
 *
 * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
 * @since 3.1.0
 */

+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );

+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 require( '../update.php' );
--- a/wp-admin/network/upgrade.php
+++ b/wp-admin/network/upgrade.php
@ -7,9 +7,10 @@
 * @since 3.0.0
 */

-require_once('./admin.php');
+/** Load WordPress Administration Bootstrap */
+require_once( './admin.php' );

-if ( !is_multisite() )
+if ( ! is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );

 require_once( ABSPATH . WPINC . '/http.php' );
--- a/wp-admin/network/user-edit.php
+++ b/wp-admin/network/user-edit.php
@ -3,10 +3,14 @@
 * Edit user network administration panel.
 *
 * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
 * @since 3.1.0
 */

+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );

+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 require( '../user-edit.php' );
--- a/wp-admin/network/user-new.php
+++ b/wp-admin/network/user-new.php
@ -1,15 +1,14 @@
 <?php
-
 /**
 * Add Site Administration Screen
 *
 * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
 * @since 3.1.0
 */

 /** Load WordPress Administration Bootstrap */
-require_once('./admin.php');
+require_once( './admin.php' );

 if ( ! is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
--- a/wp-admin/network/users.php
+++ b/wp-admin/network/users.php
@ -7,8 +7,12 @@
 * @since 3.0.0
 */

+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );

+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 $wp_list_table = get_list_table('WP_MS_Users_List_Table');
 $wp_list_table->check_permissions();
 $wp_list_table->prepare_items();
@ -72,6 +76,8 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty(
 	?>
 	</h2>

+	<?php $wp_list_table->views(); ?>
+
 	<form action="" method="get" class="search-form">
 		<p class="search-box">
 		<input type="text" name="s" value="<?php echo esc_attr( $usersearch ); ?>" class="search-input" id="user-search-input" />