Changeset 1096

Timestamp:

01/07/2015 07:32:23 PM (12 years ago)

Author:

iandunn

Message:

Official WordPress Events: Modularize the formatting of meetup venue locations.

File:

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

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

@@ -164 +164 @@
                 if ( $meetups ) {
                         foreach ( $meetups as $meetup ) {
-                                $location        = array();
                                 $start_timestamp = ( $meetup->time / 1000 ) + ( $meetup->utc_offset / 1000 );    // convert to seconds
 
                                 if ( isset( $meetup->venue ) ) {
-                                        foreach ( array( 'city', 'state', 'country' ) as $part ) {
-                                                if ( ! empty( $meetup->venue->$part ) ) {
-                                                        if ( in_array( $part, array( 'state', 'country' ) ) ) {
-                                                                $location[] = strtoupper( $meetup->venue->$part );
-                                                        } else {
-                                                                $location[] = $meetup->venue->$part;
-                                                        }
-                                                }
-                                        }
-                                        $location = implode( ', ', $location );
+                                        $location = $this->format_meetup_venue_location( $meetup->venue );
                                 } else {
                                         $location = $this->reverse_geocode( $meetup->group->group_lat, $meetup->group->group_lon );
@@ -275 +265 @@
 
         /**
+         * Format a meetup venue's location
+         *
+         * @param object $venue
+         *
+         * @return string
+         */
+        protected function format_meetup_venue_location( $venue ) {
+                $location = array();
+
+                foreach ( array( 'city', 'state', 'country' ) as $part ) {
+                        if ( ! empty( $venue->$part ) ) {
+                                if ( in_array( $part, array( 'state', 'country' ) ) ) {
+                                        $location[] = strtoupper( $venue->$part );
+                                } else {
+                                        $location[] = $venue->$part;
+                                }
+                        }
+                }
+
+                return implode( ', ', $location );
+        }
+
+        /**
          * Wrapper for wp_remote_get()
          *