From 58ca14e44dccd8c1813499917d0d466919ceeb66 Mon Sep 17 00:00:00 2001
From: Paul Biron <paul@sparrowhawkcomputing.com>
Date: Tue, 10 Jul 2018 12:57:23 -0600
Subject: [PATCH] corrected patch to #44025
---
src/wp-admin/includes/admin-filters.php | 2 ++
src/wp-admin/includes/misc.php | 2 ++
src/wp-admin/includes/user.php | 16 +++++++++++++++-
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/wp-admin/includes/admin-filters.php b/src/wp-admin/includes/admin-filters.php
index bfc9f51..0816b24 100644
a
|
b
|
add_action( 'admin_head', '_ipad_meta' ); |
47 | 47 | |
48 | 48 | // Privacy tools |
49 | 49 | add_action( 'admin_menu', '_wp_privacy_hook_requests_page' ); |
| 50 | add_action( 'load-tools_page_export_personal_data', '_wp_privacy_requests_screen_options' ); |
| 51 | add_action( 'load-tools_page_remove_personal_data', '_wp_privacy_requests_screen_options' ); |
50 | 52 | |
51 | 53 | // Prerendering. |
52 | 54 | if ( ! is_customize_preview() ) { |
diff --git a/src/wp-admin/includes/misc.php b/src/wp-admin/includes/misc.php
index 013d006..b351877 100644
a
|
b
|
function set_screen_options() { |
619 | 619 | case 'upload_per_page': |
620 | 620 | case 'edit_tags_per_page': |
621 | 621 | case 'plugins_per_page': |
| 622 | case 'export_personal_data_requests_per_page': |
| 623 | case 'remove_personal_data_requests_per_page': |
622 | 624 | // Network admin |
623 | 625 | case 'sites_network_per_page': |
624 | 626 | case 'users_network_per_page': |
diff --git a/src/wp-admin/includes/user.php b/src/wp-admin/includes/user.php
index fa868d9..9654b26 100644
a
|
b
|
function _wp_privacy_hook_requests_page() { |
1005 | 1005 | add_submenu_page( 'tools.php', __( 'Erase Personal Data' ), __( 'Erase Personal Data' ), 'erase_others_personal_data', 'remove_personal_data', '_wp_personal_data_removal_page' ); |
1006 | 1006 | } |
1007 | 1007 | |
| 1008 | /** |
| 1009 | * Add options for the privacy requests screens. |
| 1010 | * |
| 1011 | * @since 4.9.7 |
| 1012 | * @access private |
| 1013 | */ |
| 1014 | function _wp_privacy_requests_screen_options() { |
| 1015 | $args = array( |
| 1016 | 'default' => 20, |
| 1017 | 'option' => str_replace( 'tools_page_', '', get_current_screen()->id ) . '_requests_per_page', |
| 1018 | ); |
| 1019 | add_screen_option( 'per_page', $args ); |
| 1020 | } |
| 1021 | |
1008 | 1022 | // TODO: move the following classes in new files. |
1009 | 1023 | if ( ! class_exists( 'WP_List_Table' ) ) { |
1010 | 1024 | require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' ); |
… |
… |
abstract class WP_Privacy_Requests_Table extends WP_List_Table { |
1221 | 1235 | ); |
1222 | 1236 | |
1223 | 1237 | $this->items = array(); |
1224 | | $posts_per_page = 20; |
| 1238 | $posts_per_page = $this->get_items_per_page( $this->request_type . '_requests_per_page' ); |
1225 | 1239 | $args = array( |
1226 | 1240 | 'post_type' => $this->post_type, |
1227 | 1241 | 'post_name__in' => array( $this->request_type ), |