From 257be25506922fe534d36fdc1ffb84b6141f409c Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 2 May 2018 00:18:26 +0000 Subject: [PATCH] Privacy: docs fixes and improvements for `wp_comments_personal_data_exporter()`. Props desrosj. Merges [43058] to the 4.9 branch. See #43440. Built from https://develop.svn.wordpress.org/branches/4.9@43079 git-svn-id: http://core.svn.wordpress.org/branches/4.9@42908 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/comment.php | 24 ++++++++++++------------ wp-includes/version.php | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/wp-includes/comment.php b/wp-includes/comment.php index 4713b8c2b8..7fce90309d 100644 --- a/wp-includes/comment.php +++ b/wp-includes/comment.php @@ -3151,7 +3151,7 @@ function wp_handle_comment_submission( $comment_data ) { * * @since 4.9.6 * - * @param array $exporters An array of personal data exporters. + * @param array $exporters An array of personal data exporters. * @return array $exporters An array of personal data exporters. */ function wp_register_comment_personal_data_exporter( $exporters ) { @@ -3168,12 +3168,11 @@ function wp_register_comment_personal_data_exporter( $exporters ) { * * @since 4.9.6 * - * @param string $email_address The comment author email address. - * @param int $page Comment page. - * @return array $return An array of personal data. + * @param string $email_address The comment author email address. + * @param int $page Comment page. + * @return array $return An array of personal data. */ function wp_comments_personal_data_exporter( $email_address, $page = 1 ) { - // Limit us to 500 comments at a time to avoid timing out. $number = 500; $page = (int) $page; @@ -3182,11 +3181,12 @@ function wp_comments_personal_data_exporter( $email_address, $page = 1 ) { $comments = get_comments( array( - 'author_email' => $email_address, - 'number' => $number, - 'paged' => $page, - 'order_by' => 'comment_ID', - 'order' => 'ASC', + 'author_email' => $email_address, + 'number' => $number, + 'paged' => $page, + 'order_by' => 'comment_ID', + 'order' => 'ASC', + 'update_comment_meta_cache' => false, ) ); @@ -3195,7 +3195,7 @@ function wp_comments_personal_data_exporter( $email_address, $page = 1 ) { 'comment_author_email' => __( 'Comment Author Email' ), 'comment_author_url' => __( 'Comment Author URL' ), 'comment_author_IP' => __( 'Comment Author IP' ), - 'comment_agent' => __( 'Comment Agent' ), + 'comment_agent' => __( 'Comment Author User Agent' ), 'comment_date' => __( 'Comment Date' ), 'comment_content' => __( 'Comment Content' ), 'comment_link' => __( 'Comment URL' ), @@ -3214,7 +3214,7 @@ function wp_comments_personal_data_exporter( $email_address, $page = 1 ) { case 'comment_author_IP': case 'comment_agent': case 'comment_date': - $value = $comment->$key; + $value = $comment->{$key}; break; case 'comment_content': diff --git a/wp-includes/version.php b/wp-includes/version.php index 21641dd6d0..cd1fbf0e20 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.9.6-alpha-43078'; +$wp_version = '4.9.6-alpha-43079'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.