WordPress.org

Make WordPress Core

Ticket #16208: garyc40.16208.diff

File garyc40.16208.diff, 4.8 KB (added by garyc40, 7 years ago)

first attempt, needs sanity check

  • wp-admin/edit-comments.php

    diff --git wp-admin/edit-comments.php wp-admin/edit-comments.php
    index 561349f..f9b550a 100644
    if ( $doaction ) { 
    101101
    102102$wp_list_table->prepare_items();
    103103
    104 $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
    105 if ( $pagenum > $total_pages && $total_pages > 0 ) {
    106         wp_redirect( add_query_arg( 'paged', $total_pages ) );
    107         exit;
    108 }
    109 
    110104wp_enqueue_script('admin-comments');
    111105enqueue_comment_hotkeys_js();
    112106
  • wp-admin/edit.php

    diff --git wp-admin/edit.php wp-admin/edit.php
    index 2fb8679..458e5ee 100644
    if ( 'post' != $post_type ) { 
    142142
    143143$wp_list_table->prepare_items();
    144144
    145 $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
    146 if ( $pagenum > $total_pages && $total_pages > 0 ) {
    147         wp_redirect( add_query_arg( 'paged', $total_pages ) );
    148         exit;
    149 }
    150 
    151145wp_enqueue_script('inline-edit-post');
    152146
    153147$title = $post_type_object->labels->name;
  • wp-admin/includes/class-wp-list-table.php

    diff --git wp-admin/includes/class-wp-list-table.php wp-admin/includes/class-wp-list-table.php
    index fd4cf8d..12c4d04 100644
    class WP_List_Table { 
    138138                if ( !$args['total_pages'] && $args['per_page'] > 0 )
    139139                        $args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
    140140
     141                if ( ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) && $args['total_pages'] > 0 && $this->get_pagenum() > $args['total_pages'] ) {
     142                        wp_redirect( add_query_arg( 'paged', $args['total_pages'] ) );
     143                        exit;
     144                }
     145               
    141146                $this->_pagination_args = $args;
    142147        }
    143148
  • wp-admin/network/sites.php

    diff --git wp-admin/network/sites.php wp-admin/network/sites.php
    index ec4ce56..e6c0333 100644
    if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty( 
    8888
    8989$wp_list_table->prepare_items();
    9090
    91 $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
    92 if ( $pagenum > $total_pages && $total_pages > 0 ) {
    93         wp_redirect( add_query_arg( 'paged', $total_pages ) );
    94         exit;
    95 }
    96 
    9791require_once( '../admin-header.php' );
    9892?>
    9993
  • wp-admin/network/themes.php

    diff --git wp-admin/network/themes.php wp-admin/network/themes.php
    index ed23b41..3e042b5 100644
    if ( $action ) { 
    171171
    172172$wp_list_table->prepare_items();
    173173
    174 $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
    175 if ( $pagenum > $total_pages && $total_pages > 0 ) {
    176         wp_redirect( add_query_arg( 'paged', $total_pages ) );
    177         exit;
    178 }
    179 
    180174add_thickbox();
    181175
    182176add_screen_option( 'per_page', array('label' => _x( 'Themes', 'themes per page (screen options)' )) );
  • wp-admin/plugin-install.php

    diff --git wp-admin/plugin-install.php wp-admin/plugin-install.php
    index 2754025..2bed8ac 100644
    if ( is_multisite() && ! is_network_admin() ) { 
    2323$wp_list_table = get_list_table('WP_Plugin_Install_List_Table');
    2424$pagenum = $wp_list_table->get_pagenum();
    2525$wp_list_table->prepare_items();
    26 $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
    27 if ( $pagenum > $total_pages && $total_pages > 0 ) {
    28         wp_redirect( add_query_arg( 'paged', $total_pages ) );
    29         exit;
    30 }
    3126
    3227$title = __('Install Plugins');
    3328$parent_file = 'plugins.php';
  • wp-admin/plugins.php

    diff --git wp-admin/plugins.php wp-admin/plugins.php
    index 2f8b085..9baedc0 100644
    if ( $action ) { 
    316316
    317317$wp_list_table->prepare_items();
    318318
    319 $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
    320 if ( $pagenum > $total_pages && $total_pages > 0 ) {
    321         wp_redirect( add_query_arg( 'paged', $total_pages ) );
    322         exit;
    323 }
    324 
    325319wp_enqueue_script('plugin-install');
    326320add_thickbox();
    327321
  • wp-admin/theme-install.php

    diff --git wp-admin/theme-install.php wp-admin/theme-install.php
    index be0a470..ca95eb8 100644
    if ( is_multisite() && ! is_network_admin() ) { 
    2323$wp_list_table = get_list_table('WP_Theme_Install_List_Table');
    2424$pagenum = $wp_list_table->get_pagenum();
    2525$wp_list_table->prepare_items();
    26 $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
    27 if ( $pagenum > $total_pages && $total_pages > 0 ) {
    28         wp_redirect( add_query_arg( 'paged', $total_pages ) );
    29         exit;
    30 }
    3126
    3227$title = __('Install Themes');
    3328$parent_file = 'themes.php';
  • wp-admin/upload.php

    diff --git wp-admin/upload.php wp-admin/upload.php
    index ed1665b..ad47fa2 100644
    if ( $doaction ) { 
    132132
    133133$wp_list_table->prepare_items();
    134134
    135 $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
    136 if ( $pagenum > $total_pages && $total_pages > 0 ) {
    137         wp_redirect( add_query_arg( 'paged', $total_pages ) );
    138         exit;
    139 }
    140 
    141135$title = __('Media Library');
    142136$parent_file = 'upload.php';
    143137