WordPress 4.5

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

diff --git a/wp-admin/network/sites.php b/wp-admin/network/sites.php
index e0e7e1e9952df6af5c8d5173f35235b9897615a9..e03fad1d8a8a690494cb661e42780113b7611b66 100644 (file)
--- a/wp-admin/network/sites.php
+++ b/wp-admin/network/sites.php
@@ -35,7 +35,7 @@ get_current_screen()->add_help_tab( array(
                '<li>' . __('Dashboard leads to the Dashboard for that site.') . '</li>' .
                '<li>' . __('Deactivate, Archive, and Spam which lead to confirmation screens. These actions can be reversed later.') . '</li>' .
                '<li>' . __('Delete which is a permanent action after the confirmation screens.') . '</li>' .
-               '<li>' . __('Visit to go to the frontend site live.') . '</li></ul>' .
+               '<li>' . __('Visit to go to the front-end site live.') . '</li></ul>' .
                '<p>' . __('The site ID is used internally, and is not shown on the front end of the site or to users/viewers.') . '</p>' .
                '<p>' . __('Clicking on bold headings can re-sort this table.') . '</p>'
 ) );
@@ -59,8 +59,8 @@ if ( isset( $_GET['action'] ) ) {
 
        // A list of valid actions and their associated messaging for confirmation output.
        $manage_actions = array(
-               'activateblog'   => __( 'You are about to activate the site %s' ),
-               'deactivateblog' => __( 'You are about to deactivate the site %s' ),
+               'activateblog'   => __( 'You are about to activate the site %s.' ),
+               'deactivateblog' => __( 'You are about to deactivate the site %s.' ),
                'unarchiveblog'  => __( 'You are about to unarchive the site %s.' ),
                'archiveblog'    => __( 'You are about to archive the site %s.' ),
                'unspamblog'     => __( 'You are about to unspam the site %s.' ),
@@ -161,7 +161,11 @@ if ( isset( $_GET['action'] ) ) {
                                        }
                                }
                        } else {
-                               wp_redirect( network_admin_url( 'sites.php' ) );
+                               $location = network_admin_url( 'sites.php' );
+                               if ( ! empty( $_REQUEST['paged'] ) ) {
+                                       $location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
+                               }
+                               wp_redirect( $location );
                                exit();
                        }
                break;
@@ -284,7 +288,9 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
        <a href="<?php echo network_admin_url('site-new.php'); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'site' ); ?></a>
 <?php endif; ?>
 
-<?php if ( isset( $_REQUEST['s'] ) && $_REQUEST['s'] ) {
+<?php
+if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
+       /* translators: %s: search keywords */
        printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $s ) );
 } ?>
 </h1>