From 2ce4a04aff7a5de2ec72500dbf44d89d827c267c Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 9 May 2018 14:31:26 +0000
Subject: [PATCH] Privacy: Mark processed requests as completed instead of
 confirmed.

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
---
 wp-admin/includes/user.php | 10 +++++-----
 wp-includes/version.php    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php
index 87803e763e..81654535c6 100644
--- a/wp-admin/includes/user.php
+++ b/wp-admin/includes/user.php
@@ -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
  * @access private
  *
- * @param int $request_id Request ID.
- * @return int|WP_Error Request ID on succes or WP_Error.
+ * @param  int          $request_id Request ID.
+ * @return int|WP_Error $request    Request ID on success or WP_Error.
  */
 function _wp_privacy_completed_request( $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.' ) );
 	}
 
-	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(
 		'ID'          => $request_id,
-		'post_status' => 'request-confirmed',
+		'post_status' => 'request-completed',
 	) );
 
 	return $request;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 80cb0f8fcb..1b95973064 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @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.