WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Dashboard: Always pass the IP when getting events 

Allows the API to determine event locations more accurately.

Props iandunn.
See #40702.

Built from https://develop.svn.wordpress.org/trunk@40774


git-svn-id: http://core.svn.wordpress.org/trunk@40632 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Konstantin Obenland 2017-05-18 07:31:43 +00:00
parent 71adf97a35
commit 7cae389acc
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wp-admin/includes/class-wp-community-events.php
View File

@ -137,13 +137,16 @@ class WP_Community_Events {
* @access protected * @access protected
* @since 4.8.0 * @since 4.8.0
* *
* @param string $search City search string. Default empty string. * @param string $search Optional. City search string. Default empty string.
* @param string $timezone Timezone string. Default empty string. * @param string $timezone Optional. Timezone string. Default empty string.
* @return string The request URL. * @return string The request URL.
*/ */
protected function get_request_url( $search = '', $timezone = '' ) { protected function get_request_url( $search = '', $timezone = '' ) {
$api_url = 'https://api.wordpress.org/events/1.0/'; $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 * Send the minimal set of necessary arguments, in order to increase the
@ -161,16 +164,6 @@ class WP_Community_Events {
if ( $search ) { if ( $search ) {
$args['location'] = $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() );
} }
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.8-beta1-40773'; $wp_version = '4.8-beta1-40774';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.