Index: src/wp-admin/includes/ajax-actions.php =================================================================== --- src/wp-admin/includes/ajax-actions.php (revision 47148) +++ src/wp-admin/includes/ajax-actions.php (working copy) @@ -4710,8 +4710,8 @@ check_ajax_referer( 'wp-privacy-export-personal-data-' . $request_id, 'security' ); - // Get the request data. - $request = wp_get_user_request_data( $request_id ); + // Get the request. + $request = wp_get_user_request( $request_id ); if ( ! $request || 'export_personal_data' !== $request->action_name ) { wp_send_json_error( __( 'Invalid request type.' ) ); @@ -4901,8 +4901,8 @@ check_ajax_referer( 'wp-privacy-erase-personal-data-' . $request_id, 'security' ); - // Get the request data. - $request = wp_get_user_request_data( $request_id ); + // Get the request. + $request = wp_get_user_request( $request_id ); if ( ! $request || 'remove_personal_data' !== $request->action_name ) { wp_send_json_error( __( 'Invalid request type.' ) ); Index: src/wp-admin/includes/class-wp-privacy-requests-table.php =================================================================== --- src/wp-admin/includes/class-wp-privacy-requests-table.php (revision 47148) +++ src/wp-admin/includes/class-wp-privacy-requests-table.php (working copy) @@ -302,7 +302,7 @@ $requests = $requests_query->posts; foreach ( $requests as $request ) { - $this->items[] = wp_get_user_request_data( $request->ID ); + $this->items[] = wp_get_user_request( $request->ID ); } $this->items = array_filter( $this->items ); Index: src/wp-admin/includes/deprecated.php =================================================================== --- src/wp-admin/includes/deprecated.php (revision 47148) +++ src/wp-admin/includes/deprecated.php (working copy) @@ -1563,3 +1563,18 @@ function _wp_privacy_requests_screen_options() { _deprecated_function( __FUNCTION__, '5.3.0' ); } + +/** + * Return the user request object for the specified request ID. + * + * @since 4.9.6 + * @deprecated 5.4.0 Use wp_get_user_request() + * @see wp_get_user_request() + * + * @param int $request_id The ID of the user request. + * @return WP_User_Request|false + */ +function wp_get_user_request_data( $request_id ) { + _deprecated_function( __FUNCTION__, '5.4.0', 'wp_get_user_request()' ); + return wp_get_user_request( $request_id ); +} \ No newline at end of file Index: src/wp-admin/includes/privacy-tools.php =================================================================== --- src/wp-admin/includes/privacy-tools.php (revision 47148) +++ src/wp-admin/includes/privacy-tools.php (working copy) @@ -44,8 +44,9 @@ * @return int|WP_Error $result Request ID on success or WP_Error. */ function _wp_privacy_completed_request( $request_id ) { + // Get the request. $request_id = absint( $request_id ); - $request = wp_get_user_request_data( $request_id ); + $request = wp_get_user_request( $request_id ); if ( ! $request ) { return new WP_Error( 'privacy_request_error', __( 'Invalid request.' ) ); @@ -288,8 +289,8 @@ wp_send_json_error( __( 'Unable to generate export file. ZipArchive not available.' ) ); } - // Get the request data. - $request = wp_get_user_request_data( $request_id ); + // Get the request. + $request = wp_get_user_request( $request_id ); if ( ! $request || 'export_personal_data' !== $request->action_name ) { wp_send_json_error( __( 'Invalid request ID when generating export file.' ) ); @@ -499,8 +500,8 @@ * @return true|WP_Error True on success or `WP_Error` on failure. */ function wp_privacy_send_personal_data_export_email( $request_id ) { - // Get the request data. - $request = wp_get_user_request_data( $request_id ); + // Get the request. + $request = wp_get_user_request( $request_id ); if ( ! $request || 'export_personal_data' !== $request->action_name ) { return new WP_Error( 'invalid_request', __( 'Invalid request ID when sending personal data export email.' ) ); @@ -669,8 +670,8 @@ return $response; } - // Get the request data. - $request = wp_get_user_request_data( $request_id ); + // Get the request. + $request = wp_get_user_request( $request_id ); if ( ! $request || 'export_personal_data' !== $request->action_name ) { wp_send_json_error( __( 'Invalid request ID when merging exporter data.' ) ); @@ -813,7 +814,8 @@ return $response; } - $request = wp_get_user_request_data( $request_id ); + // Get the request. + $request = wp_get_user_request( $request_id ); if ( ! $request || 'remove_personal_data' !== $request->action_name ) { wp_send_json_error( __( 'Invalid request ID when processing eraser data.' ) ); Index: src/wp-includes/user.php =================================================================== --- src/wp-includes/user.php (revision 47148) +++ src/wp-includes/user.php (working copy) @@ -3027,7 +3027,7 @@ * @param int $request_id ID of the request. */ function _wp_privacy_account_request_confirmed( $request_id ) { - $request = wp_get_user_request_data( $request_id ); + $request = wp_get_user_request( $request_id ); if ( ! $request ) { return; @@ -3057,7 +3057,7 @@ * @param int $request_id The ID of the request. */ function _wp_privacy_send_request_confirmation_notification( $request_id ) { - $request = wp_get_user_request_data( $request_id ); + $request = wp_get_user_request( $request_id ); if ( ! is_a( $request, 'WP_User_Request' ) || 'request-confirmed' !== $request->status ) { return; @@ -3196,7 +3196,7 @@ * @param int $request_id The privacy request post ID associated with this request. */ function _wp_privacy_send_erasure_fulfillment_notification( $request_id ) { - $request = wp_get_user_request_data( $request_id ); + $request = wp_get_user_request( $request_id ); if ( ! is_a( $request, 'WP_User_Request' ) || 'request-completed' !== $request->status ) { return; @@ -3346,7 +3346,7 @@ * @return string $message The confirmation message. */ function _wp_privacy_account_request_confirmed_message( $request_id ) { - $request = wp_get_user_request_data( $request_id ); + $request = wp_get_user_request( $request_id ); $message = '

' . __( 'Action has been confirmed.' ) . '

'; $message .= '

' . __( 'The site administrator has been notified and will fulfill your request as soon as possible.' ) . '

'; @@ -3482,7 +3482,7 @@ */ function wp_send_user_request( $request_id ) { $request_id = absint( $request_id ); - $request = wp_get_user_request_data( $request_id ); + $request = wp_get_user_request( $request_id ); if ( ! $request ) { return new WP_Error( 'invalid_request', __( 'Invalid user request.' ) ); @@ -3644,7 +3644,7 @@ global $wp_hasher; $request_id = absint( $request_id ); - $request = wp_get_user_request_data( $request_id ); + $request = wp_get_user_request( $request_id ); if ( ! $request ) { return new WP_Error( 'invalid_request', __( 'Invalid request.' ) ); @@ -3696,14 +3696,14 @@ } /** - * Return data about a user request. + * Return the user request object for the specified request ID. * * @since 4.9.6 * - * @param int $request_id Request ID to get data about. + * @param int $request_id The ID of the user request. * @return WP_User_Request|false */ -function wp_get_user_request_data( $request_id ) { +function wp_get_user_request( $request_id ) { $request_id = absint( $request_id ); $post = get_post( $request_id ); Index: tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportFile.php =================================================================== --- tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportFile.php (revision 47148) +++ tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportFile.php (working copy) @@ -258,7 +258,7 @@ $this->assertTrue( file_exists( $report_dir . 'index.html' ) ); $report_contents = file_get_contents( $report_dir . 'index.html' ); - $request = wp_get_user_request_data( self::$export_request_id ); + $request = wp_get_user_request( self::$export_request_id ); $this->assertContains( '

Personal Data Export

', $report_contents ); $this->assertContains( '

About

', $report_contents ); @@ -285,7 +285,7 @@ $zip->extractTo( $report_dir ); $zip->close(); - $request = wp_get_user_request_data( self::$export_request_id ); + $request = wp_get_user_request( self::$export_request_id ); $this->assertTrue( file_exists( $report_dir . 'export.json' ) ); Index: tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php =================================================================== --- tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php (revision 47148) +++ tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php (working copy) @@ -152,16 +152,16 @@ } /** - * Filter callback that modifies the recipient of the data request confirmation notification. + * Filter callback that modifies the recipient of the user request confirmation notification. * * @since 4.9.8 * * @param string $admin_email The email address of the notification recipient. - * @param WP_User_Request $request_data The request that is initiating the notification. + * @param WP_User_Request $request The request that is initiating the notification. * @return string Admin email address. */ - public function modify_email_address( $admin_email, $request_data ) { - $admin_email = $request_data->email; + public function modify_email_address( $admin_email, $request ) { + $admin_email = $request->email; return $admin_email; }