Privacy: Use consistent variable naming when working with privacy requests.
Throughout the core privacy functions, `WP_User_Request` instances were stored in variables named both `$request`, and `$request_data`. This changes all occurrences of `$request_data` to `$request` for better consistency. Props nateallen, bruceallen, garrett-eclipse. Fixes #44708. Built from https://develop.svn.wordpress.org/trunk@44606 git-svn-id: http://core.svn.wordpress.org/trunk@44437 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
@@ -618,26 +618,26 @@ function _wp_privacy_resend_request( $request_id ) {
|
||||
* @access private
|
||||
*
|
||||
* @param int $request_id Request ID.
|
||||
* @return int|WP_Error $request Request ID on success or WP_Error.
|
||||
* @return int|WP_Error $result Request ID on success or WP_Error.
|
||||
*/
|
||||
function _wp_privacy_completed_request( $request_id ) {
|
||||
$request_id = absint( $request_id );
|
||||
$request_data = wp_get_user_request_data( $request_id );
|
||||
$request_id = absint( $request_id );
|
||||
$request = wp_get_user_request_data( $request_id );
|
||||
|
||||
if ( ! $request_data ) {
|
||||
if ( ! $request ) {
|
||||
return new WP_Error( 'privacy_request_error', __( 'Invalid request.' ) );
|
||||
}
|
||||
|
||||
update_post_meta( $request_id, '_wp_user_request_completed_timestamp', time() );
|
||||
|
||||
$request = wp_update_post(
|
||||
$result = wp_update_post(
|
||||
array(
|
||||
'ID' => $request_id,
|
||||
'post_status' => 'request-completed',
|
||||
)
|
||||
);
|
||||
|
||||
return $request;
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user