Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-25 22:35:02 +02:00
Code Issues Projects Releases Wiki Activity

Privacy: Avoid a PHP notice in wp_ajax_wp_privacy_erase_personal_data(), make sure $eraser_key is always defined.

Browse Source 
Props allendav.
Merges [43228] to the 4.9 branch.
Fixes #44040.
Built from https://develop.svn.wordpress.org/branches/4.9@43229


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43058 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2018-05-10 20:25:25 +00:00
parent cc1c032638
commit 2c2db8337f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/includes/ajax-actions.php
View File

@ -4166,6 +4166,8 @@ function wp_ajax_wp_privacy_export_personal_data() {
}
} else {
// No exporters, so we're done.
$exporter_key = '';
$response = array(
'data' => array(),
'done' => true,
@ -4185,7 +4187,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 );
@ -4382,6 +4384,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,
@ -4402,7 +4406,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 );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.9.6-beta1-43227';
$wp_version = '4.9.6-beta1-43229';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.