Changeset 48088

Timestamp:

06/18/2020 11:00:31 PM (6 years ago)

Author:

whyisjake

Message:

Privacy: Revert use relative paths for exported personal data.

Tests need to be updated to pass.

See: #44038.

Unprops: whyisjake.

File:

• trunk/src/wp-admin/includes/privacy-tools.php (modified) (4 diffs)

trunk/src/wp-admin/includes/privacy-tools.php

@@ -469 +469 @@
          * via email.
          */
-        $error = false;
-
-        // This postmeta is used from version 5.4.
-        $archive_filename = get_post_meta( $request_id, '_export_file_name', true );
-
-        // These are used for backwards compatibility.
+        $error            = false;
         $archive_url      = get_post_meta( $request_id, '_export_file_url', true );
         $archive_pathname = get_post_meta( $request_id, '_export_file_path', true );
 
-        // If archive_filename exists make sure to remove  deprecated postmeta.
-        if ( ! empty( $archive_filename ) ) {
+        if ( empty( $archive_pathname ) || empty( $archive_url ) ) {
+                $archive_filename = $file_basename . '.zip';
                 $archive_pathname = $exports_dir . $archive_filename;
                 $archive_url      = $exports_url . $archive_filename;
 
-                // Remove the deprecated postmeta.
-                delete_post_meta( $request_id, '_export_file_url' );
-                delete_post_meta( $request_id, '_export_file_path' );
-        } elseif ( ! empty( $archive_pathname ) ) {
-                // Check if archive_pathname exists create the new postmeta and remove the deprecated.
-
-                $archive_filename = basename( $archive_pathname );
-                $archive_url      = $exports_url . $archive_filename;
-
-                // Add the new postmeta that is used since version 5.4.
-                update_post_meta( $request_id, '_export_file_name', wp_normalize_path( $archive_filename ) );
-
-                // Remove the deprecated postmeta.
-                delete_post_meta( $request_id, '_export_file_url' );
-                delete_post_meta( $request_id, '_export_file_path' );
-        } else {
-                // If there's no archive_filename or archive_pathname create a new one.
-                $archive_filename = $file_basename . '.zip';
-                $archive_url      = $exports_url . $archive_filename;
-                $archive_pathname = $exports_dir . $archive_filename;
-
-                // Add the new postmeta that is used since version 5.4.
-                update_post_meta( $request_id, '_export_file_name', wp_normalize_path( $archive_filename ) );
-
-                // Remove the deprecated postmeta.
-                delete_post_meta( $request_id, '_export_file_url' );
-                delete_post_meta( $request_id, '_export_file_path' );
+                update_post_meta( $request_id, '_export_file_url', $archive_url );
+                update_post_meta( $request_id, '_export_file_path', wp_normalize_path( $archive_pathname ) );
         }
 
@@ -570 +540 @@
         $request = wp_get_user_request( $request_id );
 
-        // Get the export file URL.
-        $exports_url      = wp_privacy_exports_url();
-        $export_file_name = get_post_meta( $request_id, '_export_file_name', true );
-
         if ( ! $request || 'export_personal_data' !== $request->action_name ) {
                 return new WP_Error( 'invalid_request', __( 'Invalid request ID when sending personal data export email.' ) );
@@ -591 +557 @@
         $expiration_date = date_i18n( get_option( 'date_format' ), time() + $expiration );
 
-        $export_file_url = $exports_url . $export_file_name;
+        $export_file_url = get_post_meta( $request_id, '_export_file_url', true );
         $site_name       = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
         $site_url        = home_url();
@@ -855 +821 @@
         } else {
                 // Modify the response to include the URL of the export file so the browser can fetch it.
-                $exports_url      = wp_privacy_exports_url();
-                $export_file_name = get_post_meta( $request_id, '_export_file_name', true );
-                $export_file_url  = $exports_url . $export_file_name;
-
+                $export_file_url = get_post_meta( $request_id, '_export_file_url', true );
                 if ( ! empty( $export_file_url ) ) {
                         $response['url'] = $export_file_url;