From 699cccd86e39a603aa612fdb3469a42b6cd2bc73 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 10 May 2018 20:24:23 +0000
Subject: [PATCH] Privacy: Avoid a PHP notice in
 `wp_ajax_wp_privacy_erase_personal_data()`, make sure `$eraser_key` is always
 defined.

Props allendav.
Fixes #44040.
Built from https://develop.svn.wordpress.org/trunk@43228


git-svn-id: http://core.svn.wordpress.org/trunk@43057 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/ajax-actions.php | 8 ++++++--
 wp-includes/version.php            | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php
index aea2543623..04c31e51d3 100644
--- a/wp-admin/includes/ajax-actions.php
+++ b/wp-admin/includes/ajax-actions.php
@@ -4476,6 +4476,8 @@ function wp_ajax_wp_privacy_export_personal_data() {
 		}
 	} else {
 		// No exporters, so we're done.
+		$exporter_key = '';
+
 		$response = array(
 			'data' => array(),
 			'done' => true,
@@ -4495,7 +4497,7 @@ function wp_ajax_wp_privacy_export_personal_data() {
 	 * @param int    $page            The page for this response.
 	 * @param int    $request_id      The privacy request post ID associated with this request.
 	 * @param bool   $send_as_email   Whether the final results of the export should be emailed to the user.
-	 * @param int    $exporter_key    The key (slug) of the exporter that provided this data.
+	 * @param string $exporter_key    The key (slug) of the exporter that provided this data.
 	 */
 	$response = apply_filters( 'wp_privacy_personal_data_export_page', $response, $exporter_index, $email_address, $page, $request_id, $send_as_email, $exporter_key );
 
@@ -4692,6 +4694,8 @@ function wp_ajax_wp_privacy_erase_personal_data() {
 		}
 	} else {
 		// No erasers, so we're done.
+		$eraser_key = '';
+
 		$response = array(
 			'items_removed'  => false,
 			'items_retained' => false,
@@ -4712,7 +4716,7 @@ function wp_ajax_wp_privacy_erase_personal_data() {
 	 * @param string $email_address   The email address associated with this personal data.
 	 * @param int    $page            The page for this response.
 	 * @param int    $request_id      The privacy request post ID associated with this request.
-	 * @param int    $eraser_key      The key (slug) of the eraser that provided this data.
+	 * @param string $eraser_key      The key (slug) of the eraser that provided this data.
 	 */
 	$response = apply_filters( 'wp_privacy_personal_data_erasure_page', $response, $eraser_index, $email_address, $page, $request_id, $eraser_key );
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6b0771c8fc..4589183c80 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-43226';
+$wp_version = '5.0-alpha-43228';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.