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

Timestamp:

02/22/2017 01:22:33 AM (9 years ago)

Author:

dd32

Message:

Events API: Correctly match the locale field based, this was referencing a non-set array indicy.

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

@@ -77 +77 @@
     $location_name = '"' . strtr( $location_name, [ '"' => '', "'" => '' ] ) . '"';
     $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM geoname WHERE MATCH(name,asciiname,alternatenames) AGAINST(%s IN BOOLEAN MODE) ORDER BY FIELD(%s, country) DESC, FIELD(%s, timezone) DESC, population DESC LIMIT 1", $location_name, $country, $timezone ) );
+
     return $row;
 }
@@ -101 +102 @@
     if ( isset( $args['country'] ) ) {
         return array(
-            'country'     => $args['country'],
+            'country' => $args['country'],
         );
     }
 
     $country_code = null;
-    if ( isset( $args['location_data']['locale'] ) && preg_match( '/^[a-z]+[-_]([a-z]+)$/i', $args['location_data']['locale'], $match ) ) {
+    if ( isset( $args['locale'] ) && preg_match( '/^[a-z]+[-_]([a-z]+)$/i', $args['locale'], $match ) ) {
         $country_code = $match[1];
     }
@@ -135 +136 @@
         }
     }
-                
+
     if (
         ! empty( $args['latitude'] )  && is_numeric( $args['latitude'] ) &&