diff -r 346c88efed21 -r 5e2f62d02dcd wp/wp-admin/network/sites.php --- 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( '
' . __('For more information:') . '
' . - '' . __('Documentation on Site Management') . '
' . - '' . __('Support Forums') . '
' + '' . __('Documentation on Site Management') . '
' . + '' . __('Support Forums') . '
' ); $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.' ) ); - ?> - - > - -' . $msg . '
' . $msg . '