X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/53f4633144ed68c8b8fb5861f992b5489894a940..784f914b1e4b1c62d6657e86397c2e83bcee4295:/wp-admin/network/sites.php?ds=sidebyside

diff --git a/wp-admin/network/sites.php b/wp-admin/network/sites.php
index 733383ac..e03fad1d 100644
--- 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>'
 ) );
@@ -46,6 +46,11 @@ get_current_screen()->set_help_sidebar(
 	'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
 );
 
+get_current_screen()->set_screen_reader_content( array(
+	'heading_pagination' => __( 'Sites list navigation' ),
+	'heading_list'       => __( 'Sites list' ),
+) );
+
 $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
 
 if ( isset( $_GET['action'] ) ) {
@@ -54,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.' ),
@@ -102,7 +107,7 @@ if ( isset( $_GET['action'] ) ) {
 					<input type="hidden" name="_wp_http_referer" value="<?php echo esc_attr( wp_get_referer() ); ?>" />
 					<?php wp_nonce_field( $site_action . '_' . $id, '_wpnonce', false ); ?>
 					<p><?php echo sprintf( $manage_actions[ $site_action ], $site_address ); ?></p>
-					<?php submit_button( __( 'Confirm' ), 'button' ); ?>
+					<?php submit_button( __( 'Confirm' ), 'primary' ); ?>
 				</form>
 			</div>
 		<?php
@@ -156,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;
@@ -279,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>