From e31bd15ab51bc36a0d9d98306a2d8a3c0f8a0559 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Fri, 20 Sep 2019 20:52:58 +0000
Subject: [PATCH] Networks and Sites: Add support for the `extra_tablenav()`
 method in `WP_MS_Sites_List_Table`.

This method allows additional filters or other UI components to be added to the top and bottom of the `WP_List_Table` between the bulk actions dropdown and search input field.

Fixes #45954.
Props pbiron, desrosj.

git-svn-id: https://develop.svn.wordpress.org/trunk@46211 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../includes/class-wp-ms-sites-list-table.php | 42 +++++++++++++++++++
 src/wp-admin/network/sites.php                | 12 +++---
 2 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-ms-sites-list-table.php b/src/wp-admin/includes/class-wp-ms-sites-list-table.php
index edcec3366d..58030bea4b 100644
--- a/src/wp-admin/includes/class-wp-ms-sites-list-table.php
+++ b/src/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -230,6 +230,48 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 		}
 	}
 
+	/**
+	 * Extra controls to be displayed between bulk actions and pagination.
+	 *
+	 * @since 5.3.0
+	 *
+	 * @param string $which
+	 */
+	protected function extra_tablenav( $which ) {
+		?>
+		<div class="alignleft actions">
+		<?php
+		if ( 'top' === $which ) {
+			ob_start();
+
+			/**
+			 * Fires before the Filter button on the MS sites list table.
+			 *
+			 * @since 5.3.0
+			 *
+			 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
+			 */
+			do_action( 'restrict_manage_sites', $which );
+			$output = ob_get_clean();
+			if ( ! empty( $output ) ) {
+				echo $output;
+				submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'site-query-submit' ) );
+			}
+		}
+		?>
+		</div>
+		<?php
+		/**
+		 * Fires immediately following the closing "actions" div in the tablenav for the
+		 * MS sites list table.
+		 *
+		 * @since 5.3.0
+		 *
+		 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
+		 */
+		do_action( 'manage_sites_extra_tablenav', $which );
+	}
+
 	/**
 	 * @return array
 	 */
diff --git a/src/wp-admin/network/sites.php b/src/wp-admin/network/sites.php
index bfd5a1d4bd..227f37e289 100644
--- a/src/wp-admin/network/sites.php
+++ b/src/wp-admin/network/sites.php
@@ -231,14 +231,12 @@ if ( isset( $_GET['action'] ) ) {
 					wp_safe_redirect( $redirect_to );
 					exit();
 				}
-			} else {
-				$location = network_admin_url( 'sites.php' );
-				if ( ! empty( $_REQUEST['paged'] ) ) {
-					$location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
-				}
-				wp_redirect( $location );
-				exit();
+			} elseif ( ! empty( $_GET['_wp_http_referer'] ) ) {
+				// process query defined by WP_MS_Site_List_Table::extra_table_nav().
+				wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+				exit;
 			}
+
 			break;
 
 		case 'archiveblog':