Skip to content

Commit 2f2c858

Browse files
committed
Administration: Fix pagination in categories, tags, and plugins tables.
Fix an issue introduced in [59134] that prevented manual entry of a page number in the pagination input field from navigating pages. Requiring validation of the bulk actions input also impacted other inputs nested in the same form. Also fixes a pre-existing bug where it was not possible to navigate to page 1 using the input field. Reviewed by jorbin. Merges [59727] and [59746] to the 6.7 branch. Props ffffelix, im3dabasia1, apermo, rishavdutta, joedolson, swissspidy, jorbin, joedolson, tobiasbg, mamaduka. Fixes #62534. git-svn-id: https://develop.svn.wordpress.org/branches/6.7@59759 602fd350-edb4-49c9-b593-d223f7449a82
1 parent eb3c379 commit 2f2c858

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

src/js/_enqueues/admin/common.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1312,7 +1312,12 @@ $( function() {
13121312

13131313
$( '.bulkactions' ).parents( 'form' ).on( 'submit', function( event ) {
13141314
var form = this,
1315-
submitterName = event.originalEvent && event.originalEvent.submitter ? event.originalEvent.submitter.name : false;
1315+
submitterName = event.originalEvent && event.originalEvent.submitter ? event.originalEvent.submitter.name : false,
1316+
currentPageSelector = form.querySelector( '#current-page-selector' );
1317+
1318+
if ( currentPageSelector && currentPageSelector.defaultValue !== currentPageSelector.value ) {
1319+
return; // Pagination form submission.
1320+
}
13161321

13171322
// Observe submissions from posts lists for 'bulk_action' or users lists for 'new_role'.
13181323
var bulkFieldRelations = {

src/wp-admin/edit-tags.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,9 @@
216216
if ( $pagenum > 1 ) {
217217
$location = add_query_arg( 'paged', $pagenum, $location ); // $pagenum takes care of $total_pages.
218218
}
219+
if ( 1 === $pagenum ) {
220+
$location = remove_query_arg( 'paged', $location );
221+
}
219222

220223
/**
221224
* Filters the taxonomy redirect destination URL.

0 commit comments

Comments
 (0)