Changeset 4868

Timestamp:

02/03/2017 05:11:39 PM (10 years ago)

Author:

iandunn

Message:

Official WordPress Events: Remove PHP 7 syntax to avoid fatal errors

Apparently only some of the production web servers are running PHP 7...

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php

@@ -55 +55 @@
         public function prime_events_cache() {
                 global $wpdb;
-
-                return; // Temporarily disable to avoid PHP 7 syntax errors
 
                 $events = $this->fetch_upcoming_events();
@@ -428 +426 @@
                                         }
 
+                                        if ( ! empty( $meetup->venue->country ) ) {
+                                                $country_code = $meetup->venue->country;
+                                        } elseif ( ! empty( $location_parts['country_code'] ) ) {
+                                                $country_code = $location_parts['country_code'];
+                                        } else {
+                                                $country_code = '';
+                                        }
+
                                         $events[] = new Official_WordPress_Event( array(
                                                 'type'            => 'meetup',
@@ -440 +446 @@
                                                 'end_timestamp'   => ( empty ( $meetup->duration ) ? $start_timestamp : $start_timestamp + ( $meetup->duration / 1000 ) ), // convert to seconds
                                                 'location'        => $location,
-                                                'country_code'    => strtoupper( $meetup->venue->country ?? $location_parts['country_code'] ?? '' ),
-                                                'latitude'        => $meetup->venue->lat ?? $meetup->group->group_lat,
-                                                'longitude'       => $meetup->venue->lon ?? $meetup->group->group_lon,
+                                                'country_code'    => $country_code,
+                                                'latitude'        => empty( $meetup->venue->lat ) ? $meetup->group->group_lat : $meetup->venue->lat,
+                                                'longitude'       => empty( $meetup->venue->lon ) ? $meetup->group->group_lon : $meetup->venue->lon,
                                         ) );
                                 }