Changeset 40651

Timestamp:

05/12/2017 03:52:09 PM (7 years ago)

Author:

obenland

Message:

Dashboard: Persist location for community events

Fixes a bug where cached events & location data was not accessible because the
cache key could not be regenerated without latitude and longitude information.

Discovered and fixed during #wcber contributor day.

Props soean, kubik-rubik, obenland.
See #40702.

Location:

trunk/src/wp-admin/includes

Files:

• ajax-actions.php (modified) (1 diff)
• dashboard.php (modified) (2 diffs)

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

@@ -320 +320 @@
     } 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 );

trunk/src/wp-admin/includes/dashboard.php

@@ -1244 +1244 @@
             /* translators: %s is a placeholder for the name of a city. */
             __( 'Attend an upcoming event near %s.' ),
-            '<strong>{{ data.location }}</strong>'
+            '<strong>{{ data.location.description }}</strong>'
         ); ?>
     </script>
@@ -1281 +1281 @@
                 /* translators: 1: the city the user searched for, 2: meetup organization documentation URL */
                 __( 'There aren&#8217;t any events scheduled near %1$s at the moment. Would you like to <a href="%2$s">organize one</a>?' ),
-                '{{data.location}}',
+                '{{ data.location.description }}',
                 __( 'https://make.wordpress.org/community/handbook/meetup-organizer/welcome/' )
             ); ?>