Ticket #40702: 40702-geoip.diff

src/wp-admin/includes/class-wp-community-events.php

@@ -143 +143 @@
          */
         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(
+                        // Get more than three in case some get trimmed out.
+                        'number' => 5,
+
+                        // Anonymize the IP to protect user privacy.
+                        'ip' => $this->maybe_anonymize_ip_address( $this->get_unsafe_client_ip() ),
+                );
 
                 /*
                  * Send the minimal set of necessary arguments, in order to increase the
@@ -161 +167 @@
 
                         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() );
                         }
                 }