Changeset 13474

Timestamp:

05/08/2023 09:59:01 AM (17 months ago)

Author:

imath

Message:

Make sure Export Data page shows right info on successful export

Once a user data file has been generated by the admin in reply to an export request, the corresponding front-end user's Settings Export Data page needs to show the link to download the generated file.

Props r-a-y

Fixes #8858 (branch 11.0)

File:

• branches/11.0/src/bp-settings/bp-settings-functions.php (modified) (3 diffs)

branches/11.0/src/bp-settings/bp-settings-functions.php

@@ -264 +264 @@
  */
 function bp_settings_get_personal_data_expiration_date( WP_User_Request $request ) {
-    /** This filter is documented in wp-admin/includes/file.php */
+    /** This filter is documented in wp-includes/functions.php */
     $expiration = apply_filters( 'wp_privacy_export_expiration', 3 * DAY_IN_SECONDS );
 
@@ -291 +291 @@
  */
 function bp_settings_get_personal_data_export_url( WP_User_Request $request ) {
-    return get_post_meta( $request->ID, '_export_file_url', true );
+    if ( ! bp_settings_personal_data_export_exists( $request ) ) {
+        return '';
+    }
+
+    $file = get_post_meta( $request->ID, '_export_file_name', true );
+    return wp_privacy_exports_url() . $file;
 }
 
@@ -303 +308 @@
  */
 function bp_settings_personal_data_export_exists( WP_User_Request $request ) {
-    $file = get_post_meta( $request->ID, '_export_file_path', true );
-    return file_exists( $file );
+    $file = get_post_meta( $request->ID, '_export_file_name', true );
+    if ( empty( $file ) ) {
+        return false;
+    }
+
+    return file_exists( wp_privacy_exports_dir() . $file );
 }