Index: wp-admin/ms-admin.php
===================================================================
--- wp-admin/ms-admin.php (revision 13945)
+++ wp-admin/ms-admin.php (working copy)
@@ -1,23 +1,21 @@
-
+
-
+
-
-
@@ -61,4 +59,4 @@
-
+
Index: wp-admin/ms-delete-site.php
===================================================================
--- wp-admin/ms-delete-site.php (revision 13945)
+++ wp-admin/ms-delete-site.php (working copy)
@@ -17,8 +17,6 @@
}
}
-$action = isset( $_POST['action'] ) ? $_POST['action'] : 'splash';
-
$title = __( 'Delete Site' );
$parent_file = 'tools.php';
require_once( './admin-header.php' );
Index: wp-admin/ms-edit.php
===================================================================
--- wp-admin/ms-edit.php (revision 13945)
+++ wp-admin/ms-edit.php (working copy)
@@ -465,7 +465,7 @@
nocache_headers();
header( 'Content-Type: text/html; charset=utf-8' );
}
- if ( $current_site->blog_id == $id )
+ if ( $current_site->blog_id == $id && 'matureblog' != $_GET['action2'] && 'unmatureblog' != $_GET['action2'] )
wp_die( __( 'You are not allowed to change the current site.' ) );
?>
Index: wp-admin/ms-options.php
===================================================================
--- wp-admin/ms-options.php (revision 13945)
+++ wp-admin/ms-options.php (working copy)
@@ -4,14 +4,13 @@
if ( !is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! current_user_can( 'manage_network_options' ) )
+ wp_die( __( 'You do not have permission to access this page.' ) );
+
$title = __( 'Network Options' );
$parent_file = 'ms-admin.php';
-
include( './admin-header.php' );
-if ( ! current_user_can( 'manage_network_options' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
if (isset($_GET['updated'])) {
?>
Index: wp-admin/ms-sites.php
===================================================================
--- wp-admin/ms-sites.php (revision 13945)
+++ wp-admin/ms-sites.php (working copy)
@@ -4,16 +4,15 @@
if ( !is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
-$title = __( 'Sites' );
-$parent_file = 'ms-admin.php';
+if ( ! current_user_can( 'manage_sites' ) )
+ wp_die( __( 'You do not have permission to access this page.' ) );
wp_enqueue_script( 'admin-forms' );
+$title = __( 'Sites' );
+$parent_file = 'ms-admin.php';
require_once( './admin-header.php' );
-if ( ! current_user_can( 'manage_sites' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
$id = isset( $_GET['id'] ) ? intval( $_GET['id'] ) : 0;
if ( isset( $_GET['updated'] ) && $_GET['updated'] == 'true' && ! empty( $_GET['action'] ) ) {
@@ -125,6 +124,7 @@
+
|
@@ -133,13 +133,6 @@
|
- |
-
-
-
- |
-
-
|
@@ -153,6 +146,14 @@
|
+
+
+ |
+
+
+
+ |
+
@@ -557,25 +558,25 @@
$actions[] = '' . __( 'Activate' ) . '';
else
$actions[] = '' . __( 'Deactivate' ) . '';
-
+
if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' )
$actions[] = '' . __( 'Unarchive' ) . '';
else
$actions[] = '' . __( 'Archive' ) . '';
-
+
if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' )
$actions[] = '' . __( 'Not Spam' ) . '';
else
$actions[] = '' . __( 'Spam' ) . '';
-
- if ( get_blog_status( $blog['blog_id'], 'mature' ) == '1' )
- $actions[] = '' . __( 'Not Mature' ) . '';
- else
- $actions[] = '' . __( 'Mature' ) . '';
-
+
$actions[] = '' . __( 'Delete' ) . '';
}
+ if ( get_blog_status( $blog['blog_id'], 'mature' ) == '1' )
+ $actions[] = '' . __( 'Not Mature' ) . '';
+ else
+ $actions[] = '' . __( 'Mature' ) . '';
+
$actions[] = "" . __( 'Visit' ) . '';
if ( count( $actions ) ) : ?>
Index: wp-admin/ms-themes.php
===================================================================
--- wp-admin/ms-themes.php (revision 13945)
+++ wp-admin/ms-themes.php (working copy)
@@ -1,13 +1,13 @@
Index: wp-admin/ms-users.php
===================================================================
--- wp-admin/ms-users.php (revision 13945)
+++ wp-admin/ms-users.php (working copy)
@@ -4,15 +4,15 @@
if ( !is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
-$title = __( 'Users' );
-$parent_file = 'ms-admin.php';
+if ( ! current_user_can( 'manage_network_users' ) )
+ wp_die( __( 'You do not have permission to access this page.' ) );
wp_enqueue_script( 'admin-forms' );
+$title = __( 'Users' );
+$parent_file = 'ms-admin.php';
require_once( './admin-header.php' );
-if ( ! current_user_can( 'manage_network_users' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
if ( isset( $_GET['updated'] ) && $_GET['updated'] == 'true' && ! empty( $_GET['action'] ) ) {
?>