diff --git a/src/js/_enqueues/admin/common.js b/src/js/_enqueues/admin/common.js index 1aa35a37dba29..c7415d02c38da 100644 --- a/src/js/_enqueues/admin/common.js +++ b/src/js/_enqueues/admin/common.js @@ -1310,10 +1310,19 @@ $( function() { $document.trigger( 'wp-notice-added' ); }; + // Stores initial pagination value for comparison. + var initialPagedValue = document.querySelector( '#current-page-selector' ).value; + $( '.bulkactions' ).parents( 'form' ).on( 'submit', function( event ) { var form = this, submitterName = event.originalEvent && event.originalEvent.submitter ? event.originalEvent.submitter.name : false; + var currentPagedValue = form.querySelector( '#current-page-selector' ).value; + + if ( initialPagedValue !== currentPagedValue ) { + return; // Pagination form submission. + } + // Observe submissions from posts lists for 'bulk_action' or users lists for 'new_role'. var bulkFieldRelations = { 'bulk_action' : 'action', diff --git a/src/wp-admin/edit-tags.php b/src/wp-admin/edit-tags.php index a0a38d917d594..74381c0ec8d25 100644 --- a/src/wp-admin/edit-tags.php +++ b/src/wp-admin/edit-tags.php @@ -216,6 +216,9 @@ if ( $pagenum > 1 ) { $location = add_query_arg( 'paged', $pagenum, $location ); // $pagenum takes care of $total_pages. } + if ( 1 === $pagenum ) { + $location = remove_query_arg( 'paged', $location ); + } /** * Filters the taxonomy redirect destination URL.