Changeset 42977

Timestamp:

04/13/2018 04:14:54 PM (8 years ago)

Author:

azaozz

Message:

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

See #43481.

File:

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

trunk/src/wp-admin/includes/user.php

@@ -794 +794 @@
                                                         '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'
                                                 );
@@ -981 +981 @@
          * 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
@@ -988 +988 @@
          */
         protected $request_type = 'INVALID';
+
+        /**
+         * Post type to be used.
+         *
+         * @since 5.0.0
+         *
+         * @var string $post_type The post type.
+         */
+        protected $post_type = 'INVALID';
 
         /**
@@ -1042 +1051 @@
                 $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"' : '';
@@ -1137 +1146 @@
                 $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,
@@ -1324 +1333 @@
 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
@@ -1332 +1339 @@
          * @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';
 
         /**
@@ -1387 +1403 @@
 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
@@ -1395 +1409 @@
          * @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';
 
         /**