Changeset 40790 for trunk/src/wp-includes/script-loader.php

Timestamp:

05/19/2017 05:48:01 AM (2 years ago)

Author:

azaozz

Message:

Dashboard: Improve the handling of locations determined by geolocating the IP address and by entering a city name. Fix couple of edge cases, and some names.

Props iandunn coreymckrill.
Fixes #40702.

File:

• trunk/src/wp-includes/script-loader.php (modified) (2 diffs)

trunk/src/wp-includes/script-loader.php

@@ -1013 +1013 @@
     require_once( ABSPATH . 'wp-admin/includes/class-wp-community-events.php' );
 
-    $user_id       = get_current_user_id();
-    $user_location = get_user_option( 'community-events-location', $user_id );
-    $events_client = new WP_Community_Events( $user_id, $user_location );
+    $user_id            = get_current_user_id();
+    $saved_location     = get_user_option( 'community-events-location', $user_id );
+    $saved_ip_address   = isset( $saved_location['ip'] ) ? $saved_location['ip'] : false;
+    $current_ip_address = WP_Community_Events::get_unsafe_client_ip();
+
+    /*
+     * If the user's location is based on their IP address, then update their
+     * location when their IP address changes. This allows them to see events
+     * in their current city when travelling. Otherwise, they would always be
+     * shown events in the city where they were when they first loaded the
+     * Dashboard, which could have been months or years ago.
+     */
+    if ( $saved_ip_address && $current_ip_address && $current_ip_address !== $saved_ip_address ) {
+        $saved_location['ip'] = $current_ip_address;
+        update_user_option( $user_id, 'community-events-location', $saved_location, true );
+    }
+
+    $events_client = new WP_Community_Events( $user_id, $saved_location );
 
     wp_localize_script( 'dashboard', 'communityEventsData', array(
@@ -1024 +1039 @@
             'enter_closest_city' => __( 'Enter your closest city to find nearby events.' ),
             'error_occurred_please_try_again' => __( 'An error occurred. Please try again.' ),
+            'attend_event_near_generic' => __( 'Attend an upcoming event near you.' ),
 
             /*