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

Timestamp:

05/16/2017 10:39:37 PM (7 years ago)

Author:

iandunn

Message:

Events: Restore no_location_available behavior

r5491 introduced a new condition where the client might receive an unsuccesful location lookup, but it wasn't consistent with prior behavior. This commit applies the prior behavior to the new case, so that clients can expect a consistent no_location_available error if the location wasn't found.

See #2823

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

@@ -103 +103 @@
  */
 function build_response( $location ) {
-    if ( false === $location ) {
-        // No location was determined for the request. Bail with an error.
-        $events = array();
-        $error = 'no_location_available';
-    } else {
+    $events = array();
+
+    if ( $location ) {
         $event_args = array();
 
@@ -130 +128 @@
             $location = rebuild_location_from_event_source( $events );
         }
+    }
+
+    if ( false === $location ) {
+        $error = 'no_location_available';
     }
 
@@ -410 +412 @@
  * @param array $events
  *
- * @return array
+ * @return array|false
  */
 function rebuild_location_from_event_source( $events ) {
-    $location = array();
+    $location = false;
 
     foreach ( $events as $event ) {