Index: /trunk/src/wp-admin/includes/privacy-tools.php
===================================================================
--- /trunk/src/wp-admin/includes/privacy-tools.php (revision 48329)
+++ /trunk/src/wp-admin/includes/privacy-tools.php (revision 48330)
@@ -278,5 +278,5 @@
}
- if ( 1 < $groups_count ) {
+ if ( $groups_count > 1 ) {
$group_html .= '
';
$group_html .= '
↑ ' . esc_html__( 'Return to top' ) . '';
@@ -434,5 +434,5 @@
// Create TOC.
- if ( 1 < $groups_count ) {
+ if ( $groups_count > 1 ) {
fwrite( $file, '
' );
fwrite( $file, '
' . esc_html__( 'Table of Contents' ) . '
' );
@@ -465,49 +465,36 @@
* 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,8 +556,4 @@
$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,7 +573,10 @@
$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();
/**
Index: /trunk/tests/phpunit/tests/privacy/wpPrivacyProcessPersonalDataExportPage.php
===================================================================
--- /trunk/tests/phpunit/tests/privacy/wpPrivacyProcessPersonalDataExportPage.php (revision 48329)
+++ /trunk/tests/phpunit/tests/privacy/wpPrivacyProcessPersonalDataExportPage.php (revision 48330)
@@ -45,11 +45,11 @@
/**
- * Export Url.
+ * Exports URL.
*
* @since 5.5.0
*
- * @var string $export_url
- */
- protected static $export_url;
+ * @var string $exports_url
+ */
+ protected static $exports_url;
/**
@@ -150,7 +150,7 @@
public static function wpSetUpBeforeClass( $factory ) {
self::$requester_email = 'requester@example.com';
- self::$export_url = wp_privacy_exports_url();
+ self::$exports_url = wp_privacy_exports_url();
self::$export_file_name = 'wp-personal-data-file-Wv0RfMnGIkl4CFEDEEkSeIdfLmaUrLsl.zip';
- self::$export_file_url = self::$export_url . self::$export_file_name;
+ self::$export_file_url = self::$exports_url . self::$export_file_name;
self::$request_id = wp_create_user_request( self::$requester_email, 'export_personal_data' );
self::$page_index_first = 1;
Index: /trunk/tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php
===================================================================
--- /trunk/tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php (revision 48329)
+++ /trunk/tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php (revision 48330)
@@ -105,8 +105,8 @@
*/
public function test_function_should_send_export_link_to_requester() {
- $archive_url = wp_privacy_exports_url();
- $archive_file_name = 'wp-personal-data-file-Wv0RfMnGIkl4CFEDEEkSeIdfLmaUrLsl.zip';
- $archive_file_url = $archive_url . $archive_file_name;
- update_post_meta( self::$request_id, '_export_file_name', $archive_file_name );
+ $exports_url = wp_privacy_exports_url();
+ $export_file_name = 'wp-personal-data-file-Wv0RfMnGIkl4CFEDEEkSeIdfLmaUrLsl.zip';
+ $export_file_url = $exports_url . $export_file_name;
+ update_post_meta( self::$request_id, '_export_file_name', $export_file_name );
$email_sent = wp_privacy_send_personal_data_export_email( self::$request_id );
@@ -116,5 +116,5 @@
$this->assertSame( self::$requester_email, $mailer->get_recipient( 'to' )->address );
$this->assertContains( 'Personal Data Export', $mailer->get_sent()->subject );
- $this->assertContains( $archive_file_url, $mailer->get_sent()->body );
+ $this->assertContains( $export_file_url, $mailer->get_sent()->body );
$this->assertContains( 'please download it', $mailer->get_sent()->body );
$this->assertTrue( $email_sent );