Changeset 5537

Timestamp:

06/05/2017 10:51:59 PM (9 years ago)

Author:

iandunn

Message:

Events: Return false instead of null

See #2823
Props dd32

File:

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

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

@@ -142 +142 @@
                  *
                  * @todo Update the user-agent strings if 40702-geoip.2.diff doesn't make it into beta2
-                 * @todo Remove this back-compat code after beta2 has been out for a few days
+                 * @todo Remove this back-compat code after 4.8.0 has been out for a few days, to avoid
+                 *       impacting the feature plugin in 4.7 installs. rebuild_location_from_event_source()
+                 *       can probably be removed at that time too.
                  */
                 $use_fuzzy_locations = false !== strpos( $_SERVER['HTTP_USER_AGENT'], '4.7' ) || false !== strpos( $_SERVER['HTTP_USER_AGENT'], '4.8-beta1' );
@@ -387 +389 @@
  * @param string $dotted_ip
  *
- * @return null|object `null` on failure; an object on success
+ * @return false|object `false` on failure; an object on success
  */
 function guess_location_from_ip( $dotted_ip ) {
@@ -405 +407 @@
 
         if ( false === $long_ip || ! isset( $from, $where ) ) {
-                return;
+                return false;
         }
 
@@ -419 +421 @@
         // Unknown location:
         if ( ! $row || '-' == $row->country_short ) {
-                return;
+                return false;
         }