sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Privacy: Check if the accumulated data in wp_privacy_process_personal_data_export_page() is not empty.

Browse Source 
This avoids an error on PHP 8 caused by passing an empty string to `array_merge()`, instead of an array.

See #50913.

git-svn-id: https://develop.svn.wordpress.org/trunk@49026 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2020-09-21 13:49:07 +00:00
parent 6242c634ee
commit e8b00da747
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wp-admin/includes/privacy-tools.php
View File

@ -767,7 +767,11 @@ function wp_privacy_process_personal_data_export_page( $response, $exporter_inde
if ( 1 === $exporter_index && 1 === $page ) { if ( 1 === $exporter_index && 1 === $page ) {
update_post_meta( $request_id, '_export_data_raw', $export_data ); update_post_meta( $request_id, '_export_data_raw', $export_data );
} else { } else {
$export_data = get_post_meta( $request_id, '_export_data_raw', true ); $accumulated_data = get_post_meta( $request_id, '_export_data_raw', true );
if ( $accumulated_data ) {
$export_data = $accumulated_data;
}
} }
// Now, merge the data from the exporter response into the data we have accumulated already. // Now, merge the data from the exporter response into the data we have accumulated already.