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

Timestamp:

02/22/2017 12:47:27 AM (9 years ago)

Author:

dd32

Message:

Events API: In the event that the IP address does not have any location for it, it may have a DB entry consisting of only -.

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

@@ -80 +80 @@
 }
 
-function guess_location_from_ip( $dotted_ip, $timezone, $country ) {
+function guess_location_from_ip( $dotted_ip ) {
     global $wpdb;
 
@@ -88 +88 @@
 
     $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM ip2location WHERE ip_to >= %d ORDER BY ip_to ASC LIMIT 1", $long_ip ) );
+    // Unknown location:
+    if ( ! $row || '-' == $row->country_short ) {
+        return;
+    }
+
     return $row;
 }
@@ -120 +125 @@
     // IP:
     if ( isset( $args['ip'] ) ) {
-        $guess = guess_location_from_ip( $args['ip'], $args['timezone'] ?? '', $country_code );
+        $guess = guess_location_from_ip( $args['ip'] );
         if ( $guess ) {
             return array(