From 16b7f7908f08cb8e3f6bdc277e7a263467402fdc Mon Sep 17 00:00:00 2001 From: obenland Date: Thu, 18 May 2017 07:30:05 +0000 Subject: [PATCH] Dashboard: Always pass the IP when getting events Allows the API to determine event locations more accurately. Props iandunn. See #40702. git-svn-id: https://develop.svn.wordpress.org/trunk@40774 602fd350-edb4-49c9-b593-d223f7449a82 --- .../includes/class-wp-community-events.php | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/wp-admin/includes/class-wp-community-events.php b/src/wp-admin/includes/class-wp-community-events.php index d3c6f08699..f388c3a957 100644 --- a/src/wp-admin/includes/class-wp-community-events.php +++ b/src/wp-admin/includes/class-wp-community-events.php @@ -137,13 +137,16 @@ class WP_Community_Events { * @access protected * @since 4.8.0 * - * @param string $search City search string. Default empty string. - * @param string $timezone Timezone string. Default empty string. + * @param string $search Optional. City search string. Default empty string. + * @param string $timezone Optional. Timezone string. Default empty string. * @return string The request URL. */ protected function get_request_url( $search = '', $timezone = '' ) { $api_url = 'https://api.wordpress.org/events/1.0/'; - $args = array( 'number' => 5 ); // Get more than three in case some get trimmed out. + $args = array( + 'number' => 5, // Get more than three in case some get trimmed out. + 'ip' => $this->maybe_anonymize_ip_address( $this->get_unsafe_client_ip() ), + ); /* * Send the minimal set of necessary arguments, in order to increase the @@ -161,16 +164,6 @@ class WP_Community_Events { if ( $search ) { $args['location'] = $search; - } else { - /* - * Protect the user's privacy by anonymizing their IP before sending - * it to w.org, and only send it when necessary. - * - * The w.org API endpoint only uses the IP address when a location - * query is not provided, so we can safely avoid sending it when - * there is a query. - */ - $args['ip'] = $this->maybe_anonymize_ip_address( $this->get_unsafe_client_ip() ); } }