From 0e5e77a895955fd73f3eb16dd8ee4bd41c0ae17e Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Tue, 17 Jul 2018 07:43:24 +0000 Subject: [PATCH] Privacy: Remove some unnecessary code comments. [42967] introduced some WPCS-related comments, probably accidentally saved by an IDE. Props burhandodhy. Fixes #44590. Built from https://develop.svn.wordpress.org/trunk@43465 git-svn-id: http://core.svn.wordpress.org/trunk@43292 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/user.php | 15 ++++++++------- wp-includes/version.php | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php index fa868d913d..49f9bc2ddd 100644 --- a/wp-admin/includes/user.php +++ b/wp-admin/includes/user.php @@ -642,10 +642,10 @@ function _wp_privacy_completed_request( $request_id ) { * @access private */ function _wp_personal_data_handle_actions() { - if ( isset( $_POST['privacy_action_email_retry'] ) ) { // WPCS: input var ok. + if ( isset( $_POST['privacy_action_email_retry'] ) ) { check_admin_referer( 'bulk-privacy_requests' ); - $request_id = absint( current( array_keys( (array) wp_unslash( $_POST['privacy_action_email_retry'] ) ) ) ); // WPCS: input var ok, sanitization ok. + $request_id = absint( current( array_keys( (array) wp_unslash( $_POST['privacy_action_email_retry'] ) ) ) ); $result = _wp_privacy_resend_request( $request_id ); if ( is_wp_error( $result ) ) { @@ -664,14 +664,14 @@ function _wp_personal_data_handle_actions() { ); } } elseif ( isset( $_POST['action'] ) ) { - $action = isset( $_POST['action'] ) ? sanitize_key( wp_unslash( $_POST['action'] ) ) : ''; // WPCS: input var ok, CSRF ok. + $action = isset( $_POST['action'] ) ? sanitize_key( wp_unslash( $_POST['action'] ) ) : ''; switch ( $action ) { case 'add_export_personal_data_request': case 'add_remove_personal_data_request': check_admin_referer( 'personal-data-request' ); - if ( ! isset( $_POST['type_of_action'], $_POST['username_or_email_to_export'] ) ) { // WPCS: input var ok. + if ( ! isset( $_POST['type_of_action'], $_POST['username_or_email_to_export'] ) ) { add_settings_error( 'action_type', 'action_type', @@ -679,8 +679,8 @@ function _wp_personal_data_handle_actions() { 'error' ); } - $action_type = sanitize_text_field( wp_unslash( $_POST['type_of_action'] ) ); // WPCS: input var ok. - $username_or_email_address = sanitize_text_field( wp_unslash( $_POST['username_or_email_to_export'] ) ); // WPCS: input var ok. + $action_type = sanitize_text_field( wp_unslash( $_POST['type_of_action'] ) ); + $username_or_email_address = sanitize_text_field( wp_unslash( $_POST['username_or_email_to_export'] ) ); $email_address = ''; if ( ! in_array( $action_type, _wp_privacy_action_request_types(), true ) ) { @@ -1161,7 +1161,8 @@ abstract class WP_Privacy_Requests_Table extends WP_List_Table { */ public function process_bulk_action() { $action = $this->current_action(); - $request_ids = isset( $_REQUEST['request_id'] ) ? wp_parse_id_list( wp_unslash( $_REQUEST['request_id'] ) ) : array(); // WPCS: input var ok, CSRF ok. + $request_ids = isset( $_REQUEST['request_id'] ) ? wp_parse_id_list( wp_unslash( $_REQUEST['request_id'] ) ) : array(); + $count = 0; if ( $request_ids ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index f3b7d10da2..a424f3fbef 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '5.0-alpha-43464'; +$wp_version = '5.0-alpha-43465'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.