WordPress 4.2-scripts

[autoinstalls/wordpress.git] / wp-admin / network / sites.php

diff --git a/wp-admin/network/sites.php b/wp-admin/network/sites.php
index 4dddfcfda312e66632e3fb1b50e265fbadda578e..922ce76532940e9904ffe441eb1eeccd29d8d469 100644 (file)
--- a/wp-admin/network/sites.php
+++ b/wp-admin/network/sites.php
@@ -14,7 +14,7 @@ if ( ! is_multisite() )
        wp_die( __( 'Multisite support is not enabled.' ) );
 
 if ( ! current_user_can( 'manage_sites' ) )
        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();
 
 $wp_list_table = _get_list_table( 'WP_MS_Sites_List_Table' );
 $pagenum = $wp_list_table->get_pagenum();


@@ -22,7 +22,7 @@ $pagenum = $wp_list_table->get_pagenum();
 $title = __( 'Sites' );
 $parent_file = 'sites.php';
 
 $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',
 
 get_current_screen()->add_help_tab( array(
        'id'      => 'overview',


@@ -42,7 +42,7 @@ get_current_screen()->add_help_tab( array(
 
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
 
 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="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>'
 );
 
        '<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
 );
 


@@ -97,7 +97,7 @@ if ( isset( $_GET['action'] ) ) {
 
                case 'deleteblog':
                        if ( ! current_user_can( 'delete_sites' ) )
 
                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 ) ) {
 
                        $updated_action = 'not_deleted';
                        if ( $id != '0' && $id != $current_site->blog_id && current_user_can( 'delete_site', $id ) ) {


@@ -227,8 +227,8 @@ if ( isset( $_GET['updated'] ) ) {
                        /**
                         * Filter a specific, non-default site-updated message in the Network admin.
                         *
                        /**
                         * 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.
+                        * The dynamic portion of the hook name, `$_GET['updated']`, refers to the
+                        * non-default site update action.

                         *
                         * @since 3.1.0
                         *
                         *
                         * @since 3.1.0
                         *


@@ -239,7 +239,7 @@ if ( isset( $_GET['updated'] ) ) {
        }
 
        if ( ! empty( $msg ) )
        }
 
        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();
 }
 
 $wp_list_table->prepare_items();


@@ -261,7 +261,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 <?php echo $msg; ?>
 
 
 <?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>
 <?php $wp_list_table->search_box( __( 'Search Sites' ), 'site' ); ?>
 <input type="hidden" name="action" value="blogs" />
 </form>