WordPress 4.7.1-scripts

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

diff --git a/wp-admin/network/sites.php b/wp-admin/network/sites.php
index e03fad1d8a8a690494cb661e42780113b7611b66..96d708ac52c220fe3c484f3ee86dcabf3f4b3bdf 100644 (file)
--- a/wp-admin/network/sites.php
+++ b/wp-admin/network/sites.php
@@ -10,11 +10,8 @@
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 

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

 if ( ! current_user_can( 'manage_sites' ) )
 if ( ! current_user_can( 'manage_sites' ) )

-       wp_die( __( 'You do not have permission to access this page.' ), 403 );
+       wp_die( __( 'Sorry, you are not allowed 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();


@@ -42,8 +39,8 @@ 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="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://codex.wordpress.org/Network_Admin_Sites_Screen">Documentation on Site Management</a>') . '</p>' .
+       '<p>' . __('<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>') . '</p>'

 );
 
 get_current_screen()->set_screen_reader_content( array(
 );
 
 get_current_screen()->set_screen_reader_content( array(


@@ -90,11 +87,11 @@ if ( isset( $_GET['action'] ) ) {
                        header( 'Content-Type: text/html; charset=utf-8' );
                }
 
                        header( 'Content-Type: text/html; charset=utf-8' );
                }
 

-               if ( $current_site->blog_id == $id ) {
-                       wp_die( __( 'You are not allowed to change the current site.' ) );
+               if ( get_network()->site_id == $id ) {
+                       wp_die( __( 'Sorry, you are not allowed to change the current site.' ) );

                }
 
                }
 

-               $site_details = get_blog_details( $id );
+               $site_details = get_site( $id );

                $site_address = untrailingslashit( $site_details->domain . $site_details->path );
 
                require_once( ABSPATH . 'wp-admin/admin-header.php' );
                $site_address = untrailingslashit( $site_details->domain . $site_details->path );
 
                require_once( ABSPATH . 'wp-admin/admin-header.php' );


@@ -126,10 +123,10 @@ 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.' ), '', array( 'response' => 403 ) );
+                               wp_die( __( 'Sorry, you are not allowed to access this page.' ), '', array( 'response' => 403 ) );

 
                        $updated_action = 'not_deleted';
 
                        $updated_action = 'not_deleted';

-                       if ( $id != '0' && $id != $current_site->blog_id && current_user_can( 'delete_site', $id ) ) {
+                       if ( $id != '0' && $id != get_network()->site_id && current_user_can( 'delete_site', $id ) ) {

                                wpmu_delete_blog( $id, true );
                                $updated_action = 'delete';
                        }
                                wpmu_delete_blog( $id, true );
                                $updated_action = 'delete';
                        }


@@ -140,11 +137,11 @@ if ( isset( $_GET['action'] ) ) {
                                $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
 
                                foreach ( (array) $_POST['allblogs'] as $key => $val ) {
                                $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
 
                                foreach ( (array) $_POST['allblogs'] as $key => $val ) {

-                                       if ( $val != '0' && $val != $current_site->blog_id ) {
+                                       if ( $val != '0' && $val != get_network()->site_id ) {

                                                switch ( $doaction ) {
                                                        case 'delete':
                                                                if ( ! current_user_can( 'delete_site', $val ) )
                                                switch ( $doaction ) {
                                                        case 'delete':
                                                                if ( ! current_user_can( 'delete_site', $val ) )

-                                                                       wp_die( __( 'You are not allowed to delete the site.' ) );
+                                                                       wp_die( __( 'Sorry, you are not allowed to delete the site.' ) );

 
                                                                $updated_action = 'all_delete';
                                                                wpmu_delete_blog( $val, true );
 
                                                                $updated_action = 'all_delete';
                                                                wpmu_delete_blog( $val, true );


@@ -157,9 +154,17 @@ if ( isset( $_GET['action'] ) ) {
                                                        break;
                                                }
                                        } else {
                                                        break;
                                                }
                                        } else {

-                                               wp_die( __( 'You are not allowed to change the current site.' ) );
+                                               wp_die( __( 'Sorry, you are not allowed to change the current site.' ) );

                                        }
                                }
                                        }
                                }

+                               if ( ! in_array( $doaction, array( 'delete', 'spam', 'notspam' ), true ) ) {
+                                       $redirect_to = wp_get_referer();
+                                       $blogs = (array) $_POST['allblogs'];
+                                       /** This action is documented in wp-admin/network/site-themes.php */
+                                       $redirect_to = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $redirect_to, $doaction, $blogs, $id );
+                                       wp_safe_redirect( $redirect_to );
+                                       exit();
+                               }

                        } else {
                                $location = network_admin_url( 'sites.php' );
                                if ( ! empty( $_REQUEST['paged'] ) ) {
                        } else {
                                $location = network_admin_url( 'sites.php' );
                                if ( ! empty( $_REQUEST['paged'] ) ) {


@@ -237,7 +242,7 @@ if ( isset( $_GET['updated'] ) ) {
                        $msg = __( 'Site deleted.' );
                break;
                case 'not_deleted':
                        $msg = __( 'Site deleted.' );
                break;
                case 'not_deleted':

-                       $msg = __( 'You do not have permission to delete that site.' );
+                       $msg = __( 'Sorry, you are not allowed to delete that site.' );

                break;
                case 'archiveblog':
                        $msg = __( 'Site archived.' );
                break;
                case 'archiveblog':
                        $msg = __( 'Site archived.' );


@@ -259,7 +264,7 @@ if ( isset( $_GET['updated'] ) ) {
                break;
                default:
                        /**
                break;
                default:
                        /**

-                        * Filter a specific, non-default site-updated message in the Network admin.
+                        * Filters 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.


@@ -273,7 +278,7 @@ if ( isset( $_GET['updated'] ) ) {
        }
 
        if ( ! empty( $msg ) )
        }
 
        if ( ! empty( $msg ) )

-               $msg = '<div class="updated" id="message notice is-dismissible"><p>' . $msg . '</p></div>';
+               $msg = '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';

 }
 
 $wp_list_table->prepare_items();
 }
 
 $wp_list_table->prepare_items();