Changeset 43073

Timestamp:

05/01/2018 11:48:21 PM (6 years ago)

Author:

SergeyBiryukov

Message:

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

Props azaozz.
Merges [42977] to the 4.9 branch.
See #43481.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/user.php (modified) (9 diffs)

branches/4.9/src/wp-admin/includes/user.php

@@ -753 +753 @@
                             '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'
                         );
@@ -940 +940 @@
      * 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 +947 @@
      */
     protected $request_type = 'INVALID';
+
+    /**
+     * Post type to be used.
+     *
+     * @since 5.0.0
+     *
+     * @var string $post_type The post type.
+     */
+    protected $post_type = 'INVALID';
 
     /**
@@ -1001 +1010 @@
         $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"' : '';
@@ -1096 +1105 @@
         $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,
@@ -1283 +1292 @@
 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
@@ -1291 +1298 @@
      * @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';
 
     /**
@@ -1346 +1362 @@
 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
@@ -1354 +1368 @@
      * @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';
 
     /**