Changeset 48330 for trunk/src/wp-admin/includes/privacy-tools.php

Timestamp:

07/06/2020 12:32:15 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Privacy: Simplify the logic for updating the meta values for personal data export requests from absolute to relative paths.

Follow-up to [48127].

See #44038.

File:

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

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

@@ -278 +278 @@
     }
 
-    if ( 1 < $groups_count ) {
+    if ( $groups_count > 1 ) {
         $group_html .= '<div class="return-to-top">';
         $group_html .= '<a href="#top"><span aria-hidden="true">&uarr; </span> ' . esc_html__( 'Return to top' ) . '</a>';
@@ -434 +434 @@
 
     // Create TOC.
-    if ( 1 < $groups_count ) {
+    if ( $groups_count > 1 ) {
         fwrite( $file, '<div id="table_of_contents">' );
         fwrite( $file, '<h2>' . esc_html__( 'Table of Contents' ) . '</h2>' );
@@ -465 +465 @@
      * Now, generate the ZIP.
      *
-     * If an archive has already been generated, then remove it and reuse the
-     * filename, to avoid breaking any URLs that may have been previously sent
-     * via email.
+     * If an archive has already been generated, then remove it and reuse the filename,
+     * to avoid breaking any URLs that may have been previously sent via email.
      */
     $error = false;
 
-    // This postmeta is used from version 5.4.
+    // This meta value is used from version 5.5.
     $archive_filename = get_post_meta( $request_id, '_export_file_name', true );
 
-    // These are used for backward compatibility.
-    $archive_url      = get_post_meta( $request_id, '_export_file_url', true );
+    // This one stored an absolute path and is used for backward compatibility.
     $archive_pathname = get_post_meta( $request_id, '_export_file_path', true );
 
-    // If archive_filename exists, make sure to remove deprecated postmeta.
+    // If a filename meta exists, use it.
     if ( ! empty( $archive_filename ) ) {
         $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. If not, create the new postmeta and remove the deprecated.
+        // If a full path meta exists, use it and create the new meta value.
         $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.
+
+        update_post_meta( $request_id, '_export_file_name', $archive_filename );
+
+        // Remove the back-compat meta values.
         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.
+        // If there's no filename or full path stored, create a new file.
         $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_name', $archive_filename );
+    }
+
+    $archive_url = $exports_url . $archive_filename;
 
     if ( ! empty( $archive_pathname ) && file_exists( $archive_pathname ) ) {
@@ -569 +556 @@
     $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.' ) );
@@ -590 +573 @@
     $expiration_date = date_i18n( get_option( 'date_format' ), time() + $expiration );
 
-    $export_file_url = $exports_url . $export_file_name;
-    $site_name       = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
-    $site_url        = home_url();
+    $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;
+
+    $site_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+    $site_url  = home_url();
 
     /**