Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-31 04:31:35 +01:00
Code Issues Projects Releases Wiki Activity

Privacy: fix error message and list table sorting errors on the Export Personal Data and Remove Personal Data screens.

Browse Source 
Props azaozz.
Merges [42977] to the 4.9 branch.
See #43481.
Built from https://develop.svn.wordpress.org/branches/4.9@43073


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42902 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2018-05-01 23:49:26 +00:00
parent feb3e4caec
commit b1c0bffa78
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
wp-admin/includes/user.php
View File

@ -752,7 +752,7 @@ function _wp_personal_data_handle_actions() {
add_settings_error(
'username_or_email_to_export',
'username_or_email_to_export',
__( 'Unable to add export request. A valid email address or username must be supplied.' ),
__( 'Unable to add this request. A valid email address or username must be supplied.' ),
'error'
);
} else {
@ -939,7 +939,7 @@ abstract class WP_Privacy_Requests_Table extends WP_List_Table {
/**
* Action name for the requests this table will work with. Classes
* which inherit from WP_Privacy_Requests_Table should define this.
* e.g. 'user_export_request'
* e.g. 'export_personal_data'
*
* @since 5.0.0
*
@ -947,6 +947,15 @@ abstract class WP_Privacy_Requests_Table extends WP_List_Table {
*/
protected $request_type = 'INVALID';
/**
* Post type to be used.
*
* @since 5.0.0
*
* @var string $post_type The post type.
*/
protected $post_type = 'INVALID';
/**
* Get columns to show in the list table.
*
@ -1000,7 +1009,7 @@ abstract class WP_Privacy_Requests_Table extends WP_List_Table {
$statuses = _wp_privacy_statuses();
$views = array();
$admin_url = admin_url( 'tools.php?page=' . $this->request_type );
$counts = wp_count_posts( $this->request_type );
$counts = wp_count_posts( $this->post_type );
$current_link_attributes = empty( $current_status ) ? ' class="current" aria-current="page"' : '';
$views['all'] = '<a href="' . esc_url( $admin_url ) . "\" $current_link_attributes>" . esc_html__( 'All' ) . ' (' . absint( array_sum( (array) $counts ) ) . ')</a>';
@ -1095,7 +1104,7 @@ abstract class WP_Privacy_Requests_Table extends WP_List_Table {
$this->items = array();
$posts_per_page = 20;
$args = array(
'post_type' => $this->request_type,
'post_type' => $this->post_type,
'posts_per_page' => $posts_per_page,
'offset' => isset( $_REQUEST['paged'] ) ? max( 0, absint( $_REQUEST['paged'] ) - 1 ) * $posts_per_page: 0,
'post_status' => 'any',
@ -1282,15 +1291,22 @@ abstract class WP_Privacy_Requests_Table extends WP_List_Table {
*/
class WP_Privacy_Data_Export_Requests_Table extends WP_Privacy_Requests_Table {
/**
* Action name for the requests this table will work with. Classes
* which inherit from WP_Privacy_Requests_Table should define this.
* e.g. 'user_export_request'
* Action name for the requests this table will work with.
*
* @since 5.0.0
*
* @var string $request_type Name of action.
*/
protected $request_type = 'user_export_request';
protected $request_type = 'export_personal_data';
/**
* Post type for the requests.
*
* @since 5.0.0
*
* @var string $post_type The post type.
*/
protected $post_type = 'user_export_request';
/**
* Actions column.
@ -1345,15 +1361,22 @@ class WP_Privacy_Data_Export_Requests_Table extends WP_Privacy_Requests_Table {
*/
class WP_Privacy_Data_Removal_Requests_Table extends WP_Privacy_Requests_Table {
/**
* Action name for the requests this table will work with. Classes
* which inherit from WP_Privacy_Requests_Table should define this.
* e.g. 'user_remove_request'
* Action name for the requests this table will work with.
*
* @since 5.0.0
*
* @var string $request_type Name of action.
*/
protected $request_type = 'user_remove_request';
protected $request_type = 'remove_personal_data';
/**
* Post type for the requests.
*
* @since 5.0.0
*
* @var string $post_type The post type.
*/
protected $post_type = 'user_remove_request';
/**
* Actions column.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.9.6-alpha-43072';
$wp_version = '4.9.6-alpha-43073';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.