Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-30 12:11:33 +01:00
Code Issues Projects Releases Wiki Activity

Privacy: Mark processed requests as completed instead of confirmed.

Browse Source 
r43008 refactored the request flow to make several improvements, but accidentally marked `completed` requests as `confirmed`. This commit restores the intended statuses, so that the data and corresponding UI reflect reality.

Props allendav, birgire.
Merges [43183] to the 4.9 branch.
Fixes #43913.
Built from https://develop.svn.wordpress.org/branches/4.9@43187


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43016 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2018-05-09 14:31:26 +00:00
parent 809d5fa08e
commit 2ce4a04aff
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -568,13 +568,13 @@ function _wp_privacy_resend_request( $request_id ) {
} }
/** /**
* Marks a request as completed by the admin and logs the datetime. * Marks a request as completed by the admin and logs the current timestamp.
* *
* @since 4.9.6 * @since 4.9.6
* @access private * @access private
* *
* @param int $request_id Request ID. * @param int $request_id Request ID.
* @return int|WP_Error Request ID on succes or WP_Error. * @return int|WP_Error $request Request ID on success or WP_Error.
*/ */
function _wp_privacy_completed_request( $request_id ) { function _wp_privacy_completed_request( $request_id ) {
$request_id = absint( $request_id ); $request_id = absint( $request_id );
@ -584,11 +584,11 @@ function _wp_privacy_completed_request( $request_id ) {
return new WP_Error( 'privacy_request_error', __( 'Invalid request.' ) ); return new WP_Error( 'privacy_request_error', __( 'Invalid request.' ) );
} }
update_post_meta( $request_id, '_wp_user_request_confirmed_timestamp', time() ); update_post_meta( $request_id, '_wp_user_request_completed_timestamp', time() );
$request = wp_update_post( array( $request = wp_update_post( array(
'ID' => $request_id, 'ID' => $request_id,
'post_status' => 'request-confirmed', 'post_status' => 'request-completed',
) ); ) );
return $request; return $request;

2
wp-includes/version.php
View File

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