Ticket #40702: 40702-request-args.diff

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

@@ -94 +94 @@
                         return $cached_events;
                 }
 
-                $request_url    = $this->get_request_url( $location_search, $timezone );
-                $response       = wp_remote_get( $request_url );
+                $api_url        = 'https://api.wordpress.org/events/1.0/';
+                $request_args   = $this->get_request_args( $location_search, $timezone );
+                $response       = wp_remote_get( $api_url, $request_args );
                 $response_code  = wp_remote_retrieve_response_code( $response );
                 $response_body  = json_decode( wp_remote_retrieve_body( $response ), true );
                 $response_error = null;
-                $debugging_info = compact( 'request_url', 'response_code', 'response_body' );
+                $debugging_info = compact( 'api_url', 'request_args', 'response_code', 'response_body' );
 
                 if ( is_wp_error( $response ) ) {
                         $response_error = $response;
@@ -143 +144 @@
         }
 
         /**
-         * Builds a URL for requests to the w.org Events API.
+         * Builds an array of args to use in an http request to the w.org Events API.
          *
          * @access protected
          * @since 4.8.0
@@ -150 +151 @@
          *
          * @param  string $search   Optional. City search string. Default empty string.
          * @param  string $timezone Optional. Timezone string. Default empty string.
-         * @return string The request URL.
+         * @return array The request args.
          */
-        protected function get_request_url( $search = '', $timezone = '' ) {
-                $api_url = 'https://api.wordpress.org/events/1.0/';
-                $args    = array(
+        protected function get_request_args( $search = '', $timezone = '' ) {
+                $args = array(
                         'number' => 5, // Get more than three in case some get trimmed out.
                         'ip'     => $this->get_client_ip(),
                 );
 
                 /*
-                 * Send the minimal set of necessary arguments, in order to increase the
+                 * Include the minimal set of necessary arguments, in order to increase the
                  * chances of a cache-hit on the API side.
                  */
                 if ( empty( $search ) && isset( $this->user_location['latitude'], $this->user_location['longitude'] ) ) {
@@ -178 +178 @@
                         }
                 }
 
-                return add_query_arg( $args, $api_url );
+                // Wrap the args in an array compatible with the second parameter of `wp_remote_get()`.
+                return array(
+                        'body' => $args
+                );
         }
 
         /**