Ticket #17545: 17545.diff

wp-admin/network/site-themes.php

@@ -43 +43 @@
 $_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 )

wp-admin/network/site-users.php

@@ -57 +57 @@
 
 $action = $wp_list_table->current_action();
 
+// Clean up request URI from temporary args for screen options/paging uri's to work as expected.
+$_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 );
+
 if ( $action ) {
         switch_to_blog( $id );
         
@@ -146 +153 @@
         }
         
         restore_current_blog();
-        wp_redirect( add_query_arg( 'update', $update, wp_get_referer() ) );
+        wp_redirect( add_query_arg( 'update', $update, $referer ) );
         exit();
 }
 
 if ( isset( $_GET['action'] ) && 'update-site' == $_GET['action'] ) {
-        wp_redirect( wp_get_referer() );
+        wp_redirect( $referer );
         exit();
 }