From 11e5eaa6d5f1c1f82a414f2c77d8d744ec85419b Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Tue, 25 Mar 2014 16:57:15 +0000 Subject: [PATCH] Network Admin: Fix pagination on site-themes and site-users. props kawauso, jeremyfelt. fixes #17545. Built from https://develop.svn.wordpress.org/trunk@27715 git-svn-id: http://core.svn.wordpress.org/trunk@27554 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/network/site-themes.php | 4 ++++ wp-admin/network/site-users.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/wp-admin/network/site-themes.php b/wp-admin/network/site-themes.php index 6739ac4c33..687e8c03a9 100644 --- a/wp-admin/network/site-themes.php +++ b/wp-admin/network/site-themes.php @@ -44,6 +44,10 @@ $temp_args = array( 'enabled', 'disabled', 'error' ); $_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI'] ); $referer = remove_query_arg( $temp_args, wp_get_referer() ); +if ( ! empty( $_REQUEST['paged'] ) ) { + $referer = add_query_arg( 'paged', (int) $_REQUEST['paged'], $referer ); +} + $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; if ( ! $id ) diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php index 4dbf6f1f5a..4e2c6c9d92 100644 --- a/wp-admin/network/site-users.php +++ b/wp-admin/network/site-users.php @@ -39,6 +39,10 @@ get_current_screen()->set_help_sidebar( $_SERVER['REQUEST_URI'] = remove_query_arg( 'update', $_SERVER['REQUEST_URI'] ); $referer = remove_query_arg( 'update', wp_get_referer() ); +if ( ! empty( $_REQUEST['paged'] ) ) { + $referer = add_query_arg( 'paged', (int) $_REQUEST['paged'], $referer ); +} + $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; if ( ! $id )