Ticket #16262: garyc40.16262.hotkey.2.diff

wp-admin/includes/class-wp-list-table.php

@@ -478 +478 @@
                 $current = $this->get_pagenum();
 
                 $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+                
+                $current_url = remove_query_arg( array( 'hotkeys_highlight_last', 'hotkeys_highlight_first' ), $current_url );
 
                 $page_links = array();
 

wp-admin/js/edit-comments.dev.js

@@ -495 +495 @@
                                 var first_last, l;
 
                                 first_last = 'next' == which? 'first' : 'last';
-                                l = $('.'+which+'.page-numbers');
+                                l = $('.tablenav-pages .'+which+'-page:not(.disabled)');
                                 if (l.length)
                                         window.location = l[0].href.replace(/\&hotkeys_highlight_(first|last)=1/g, '')+'&hotkeys_highlight_'+first_last+'=1';
                         }