Merge branch 'WordPress:trunk' into trunk

Author: dd32

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

@@ -204,7 +204,13 @@ function _wp_personal_data_cleanup_requests() {
 			'fields'         => 'ids',
 			'date_query'     => array(
 				array(
-					'column' => 'post_modified_gmt',
+					/*
+					 * The local-time column must be used here, not post_modified_gmt:
+					 * WP_Date_Query resolves relative date strings like "N seconds ago"
+					 * in the site's timezone, so comparing against the GMT column would
+					 * shift the expiry window by the site's UTC offset.
+					 */
+					'column' => 'post_modified',
 					'before' => $expires . ' seconds ago',
 				),
 			),

src/wp-includes/default-filters.php

@@ -464,6 +464,8 @@
 add_filter( 'wp_privacy_personal_data_erasers', 'wp_register_comment_personal_data_eraser' );
 add_action( 'init', 'wp_schedule_delete_old_privacy_export_files' );
 add_action( 'wp_privacy_delete_old_export_files', 'wp_privacy_delete_old_export_files' );
+add_action( 'init', 'wp_schedule_personal_data_cleanup_requests' );
+add_action( 'wp_privacy_personal_data_cleanup_requests', 'wp_privacy_personal_data_cleanup_requests' );
 
 // Cron tasks.
 add_action( 'wp_scheduled_delete', 'wp_scheduled_delete' );

src/wp-includes/functions.php

@@ -8507,6 +8507,38 @@ function wp_schedule_delete_old_privacy_export_files() {
 	}
 }
 
+/**
+ * Schedules a WP-Cron job to clean up personal data requests.
+ *
+ * @since 7.1.0
+ *
+ * @see wp_privacy_personal_data_cleanup_requests()
+ */
+function wp_schedule_personal_data_cleanup_requests(): void {
+	if ( wp_installing() ) {
+		return;
+	}
+
+	if ( ! wp_next_scheduled( 'wp_privacy_personal_data_cleanup_requests' ) ) {
+		wp_schedule_event( time(), 'daily', 'wp_privacy_personal_data_cleanup_requests' );
+	}
+}
+
+/**
+ * Fires the personal data cleanup requests handler during cron.
+ *
+ * Loads the admin privacy tools file if needed (e.g. during cron, where
+ * wp-admin/includes/privacy-tools.php is not loaded automatically).
+ *
+ * @since 7.1.0
+ */
+function wp_privacy_personal_data_cleanup_requests(): void {
+	if ( ! function_exists( '_wp_personal_data_cleanup_requests' ) ) {
+		require_once ABSPATH . 'wp-admin/includes/privacy-tools.php';
+	}
+	_wp_personal_data_cleanup_requests();
+}
+
 /**
  * Cleans up export files older than three days old.
  *