Ticket #40702: 40702.ajax-fix.2.diff

src/wp-admin/includes/ajax-actions.php

@@ -319 +319 @@
                 ) );
         } else {
                 if ( isset( $events['location'] ) ) {
-                        // Send only the data that the client will use.
-                        $events['location'] = $events['location']['description'];
-
                         // Store the location network-wide, so the user doesn't have to set it on each site.
                         update_user_option( $user_id, 'community-events-location', $events['location'], true );
+
+                        // Send only the data that the client will use.
+                        $events['location'] = $events['location']['description'];
                 }
 
                 wp_send_json_success( $events );

src/wp-admin/includes/dashboard.php

@@ -142 +142 @@
         $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 );
+        $cached_data   = $events_client->get_cached_events();
+
+        // Send only the data that the client will use.
+        $cached_data['location'] = $cached_data['location']['description'];
 
         $script_data = array(
                 'nonce' => wp_create_nonce( 'community_events' ),
-                'cache' => $events_client->get_cached_events(),
+                'cache' => $cached_data,
 
                 'l10n' => array(
                         'enter_closest_city' => __( 'Enter your closest city to find nearby events.' ),