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

Timestamp:

06/05/2017 10:52:15 PM (7 years ago)

Author:

iandunn

Message:

Events: Select countries from countrycodes to improve performance

See #2823
Props dd32

File:

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

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

@@ -722 +722 @@
     global $wpdb;
 
-    $country = $wpdb->get_row( $wpdb->prepare( "
-        SELECT country_short, country_long
-        FROM ip2location
+    $field = 'name';
+
+    if ( strlen( $country_name ) == 2 ) {
+        $field = 'country';
+    }
+
+    return $wpdb->get_row( $wpdb->prepare( "
+        SELECT
+            country as country_short,
+            name as country_long
+        FROM countrycodes
         WHERE
-            country_long  = %s OR
-            country_short = %s
+            $field = %s
         LIMIT 1",
-        $country_name,
         $country_name
     ), 'ARRAY_A' );
-
-    // Convert all errors to boolean false for consistency
-    if ( empty( $country ) ) {
-        $country = false;
-    }
-
-    return $country;
 }