Changeset 5311 for sites/trunk/api.wordpress.org/public_html/events/1.0/index.php

Timestamp:

04/10/2017 09:28:19 PM (10 years ago)

Author:

iandunn

Message:

Events: Change search order so that coordinates take precedence over IPs

File:

• sites/trunk/api.wordpress.org/public_html/events/1.0/index.php (modified) (3 diffs)

sites/trunk/api.wordpress.org/public_html/events/1.0/index.php

@@ -356 +356 @@
 }
 
+/**
+ * Determine a location for the given parameters
+ *
+ * @param array $args
+ *
+ * @return false|array
+ */
 function get_location( $args = array() ) {
         global $cache_life, $cache_group;
@@ -378 +385 @@
         }
 
-        // Location was provided by the user:
+        // Coordinates provided
+        if (
+                ! $location && (
+                        ! empty( $args['latitude'] )  && is_numeric( $args['latitude'] ) &&
+                        ! empty( $args['longitude'] ) && is_numeric( $args['longitude'] )
+                )
+        ) {
+                $city = get_city_from_coordinates( $args['latitude'], $args['longitude'] );
+
+                $location = array(
+                        'description' => $city ? $city : "{$args['latitude']}, {$args['longitude']}",
+                        'latitude'    => $args['latitude'],
+                        'longitude'   => $args['longitude']
+                );
+        }
+
+        // City was provided by the user:
         if ( ! $location && isset( $args['location_name'] ) ) {
                 $guess = guess_location_from_city( $args['location_name'], $args['timezone'] ?? '', $country_code  );
@@ -412 +435 @@
                         );
                 }
-        }
-
-        if (
-                ! $location && (
-                        ! empty( $args['latitude'] )  && is_numeric( $args['latitude'] ) &&
-                        ! empty( $args['longitude'] ) && is_numeric( $args['longitude'] )
-                )
-        ) {
-                $city = get_city_from_coordinates( $args['latitude'], $args['longitude'] );
-
-                $location = array(
-                        'description' => $city ? $city : "{$args['latitude']}, {$args['longitude']}",
-                        'latitude'  => $args['latitude'],
-                        'longitude' => $args['longitude']
-                );
         }