--- a/wp/wp-admin/network/sites.php Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-admin/network/sites.php Tue Jun 09 03:35:32 2015 +0200
@@ -14,7 +14,7 @@
wp_die( __( 'Multisite support is not enabled.' ) );
if ( ! current_user_can( 'manage_sites' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
+ wp_die( __( 'You do not have permission to access this page.' ), 403 );
$wp_list_table = _get_list_table( 'WP_MS_Sites_List_Table' );
$pagenum = $wp_list_table->get_pagenum();
@@ -22,7 +22,7 @@
$title = __( 'Sites' );
$parent_file = 'sites.php';
-add_screen_option( 'per_page', array( 'label' => _x( 'Sites', 'sites per page (screen options)' ) ) );
+add_screen_option( 'per_page' );
get_current_screen()->add_help_tab( array(
'id' => 'overview',
@@ -42,14 +42,15 @@
get_current_screen()->set_help_sidebar(
'<p><strong>' . __('For more information:') . '</strong></p>' .
- '<p>' . __('<a href="http://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>') . '</p>' .
- '<p>' . __('<a href="http://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
+ '<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>') . '</p>' .
+ '<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
);
$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
if ( isset( $_GET['action'] ) ) {
- do_action( 'wpmuadminedit' , '' );
+ /** This action is documented in wp-admin/network/edit.php */
+ do_action( 'wpmuadminedit' );
if ( 'confirm' === $_GET['action'] ) {
check_admin_referer( 'confirm' );
@@ -58,33 +59,26 @@
nocache_headers();
header( 'Content-Type: text/html; charset=utf-8' );
}
- if ( $current_site->blog_id == $id )
+
+ if ( $current_site->blog_id == $id ) {
wp_die( __( 'You are not allowed to change the current site.' ) );
- ?>
- <!DOCTYPE html>
- <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
- <head>
- <title><?php _e( 'WordPress › Confirm your action' ); ?></title>
+ }
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <?php
- wp_admin_css( 'install', true );
- wp_admin_css( 'ie', true );
- ?>
- </head>
- <body class="wp-core-ui">
- <h1 id="logo"><a href="<?php echo esc_url( __( 'http://wordpress.org/' ) ); ?>"><?php _e( 'WordPress' ); ?></a></h1>
+ require_once( ABSPATH . 'wp-admin/admin-header.php' );
+ ?>
+ <div class="wrap">
+ <h2><?php _e( 'Confirm your action' ); ?></h2>
<form action="sites.php?action=<?php echo esc_attr( $_GET['action2'] ) ?>" method="post">
<input type="hidden" name="action" value="<?php echo esc_attr( $_GET['action2'] ) ?>" />
<input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
<input type="hidden" name="_wp_http_referer" value="<?php echo esc_attr( wp_get_referer() ); ?>" />
<?php wp_nonce_field( $_GET['action2'], '_wpnonce', false ); ?>
<p><?php echo esc_html( wp_unslash( $_GET['msg'] ) ); ?></p>
- <?php submit_button( __('Confirm'), 'button' ); ?>
+ <?php submit_button( __( 'Confirm' ), 'button' ); ?>
</form>
- </body>
- </html>
+ </div>
<?php
+ require_once( ABSPATH . 'wp-admin/admin-footer.php' );
exit();
}
@@ -103,7 +97,7 @@
case 'deleteblog':
if ( ! current_user_can( 'delete_sites' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
+ wp_die( __( 'You do not have permission to access this page.' ), '', array( 'response' => 403 ) );
$updated_action = 'not_deleted';
if ( $id != '0' && $id != $current_site->blog_id && current_user_can( 'delete_site', $id ) ) {
@@ -150,10 +144,25 @@
case 'activateblog':
update_blog_status( $id, 'deleted', '0' );
+
+ /**
+ * Fires after a network site is activated.
+ *
+ * @since MU
+ *
+ * @param string $id The ID of the activated site.
+ */
do_action( 'activate_blog', $id );
break;
case 'deactivateblog':
+ /**
+ * Fires before a network site is deactivated.
+ *
+ * @since MU
+ *
+ * @param string $id The ID of the site being deactivated.
+ */
do_action( 'deactivate_blog', $id );
update_blog_status( $id, 'deleted', '1' );
break;
@@ -215,12 +224,22 @@
$msg = __( 'Site marked as spam.' );
break;
default:
+ /**
+ * Filter a specific, non-default site-updated message in the Network admin.
+ *
+ * The dynamic portion of the hook name, `$_GET['updated']`, refers to the
+ * non-default site update action.
+ *
+ * @since 3.1.0
+ *
+ * @param string $msg The update message. Default 'Settings saved'.
+ */
$msg = apply_filters( 'network_sites_updated_message_' . $_GET['updated'], __( 'Settings saved.' ) );
break;
}
if ( ! empty( $msg ) )
- $msg = '<div class="updated" id="message"><p>' . $msg . '</p></div>';
+ $msg = '<div class="updated" id="message notice is-dismissible"><p>' . $msg . '</p></div>';
}
$wp_list_table->prepare_items();
@@ -229,7 +248,6 @@
?>
<div class="wrap">
-<?php screen_icon( 'ms-admin' ); ?>
<h2><?php _e( 'Sites' ) ?>
<?php if ( current_user_can( 'create_sites') ) : ?>
@@ -243,7 +261,7 @@
<?php echo $msg; ?>
-<form action="" method="get" id="ms-search">
+<form method="get" id="ms-search">
<?php $wp_list_table->search_box( __( 'Search Sites' ), 'site' ); ?>
<input type="hidden" name="action" value="blogs" />
</form>