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

Timestamp:

03/01/2018 09:13:34 PM (8 years ago)

Author:

iandunn

Message:

Events: Switch to utf8 charset when querying geoname_summary.

This is in conjunction with altering the table schema as described in #3295:comment:8.

Props Otto42, dd32, iandunn.
Fixes #3295

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

@@ -282 +282 @@
 
     // Exact match
-    $row = $wpdb->get_row( $wpdb->prepare( "
+    $query = "
         SELECT name, latitude, longitude, country
         FROM geoname_summary
@@ -290 +290 @@
             FIELD( %s, timezone ) DESC,
             population DESC
-        LIMIT 1",
-        $location_name,
-        $country,
-        $timezone
-    ) );
+        LIMIT 1";
+
+    $prepared_query = $wpdb->prepare( $query, $location_name, $country, $timezone );
+    $db_handle      = $wpdb->db_connect( $prepared_query );
+
+    $wpdb->set_charset( $db_handle, 'utf8' ); // The content in this table requires a UTF8 connection.
+    $row = $wpdb->get_row( $prepared_query );
+    $wpdb->set_charset( $db_handle, 'latin1' ); // Revert to the default charset to avoid affecting other queries.
 
     // Wildcard match
     if ( ! $row && $wildcard && 'ASCII' !== mb_detect_encoding( $location_name ) ) {
-        $row = $wpdb->get_row( $wpdb->prepare( "
+        $query = "
             SELECT name, latitude, longitude, country
             FROM geoname_summary
@@ -306 +309 @@
                 FIELD( %s, timezone ) DESC,
                 population DESC
-            LIMIT 1",
-            $wpdb->esc_like( $location_name ) . '%',
-            $country,
-            $timezone
-        ) );
+            LIMIT 1";
+
+        $prepared_query = $wpdb->prepare( $query, $wpdb->esc_like( $location_name ) . '%', $country, $timezone );
+        $db_handle      = $wpdb->db_connect( $prepared_query );
+
+        $wpdb->set_charset( $db_handle, 'utf8' ); // The content in this table requires a UTF8 connection.
+        $row = $wpdb->get_row( $prepared_query );
+        $wpdb->set_charset( $db_handle, 'latin1' ); // Revert to the default charset to avoid affecting other queries.
     }
 
@@ -319 +325 @@
     //   $row->name .= ', ' . $row->state;
     // }
+
+    // Strip off null bytes
+    // @todo Modify geoname script to to this instead?
+    if ( ! empty( $row->name ) ) {
+        $row->name = trim( $row->name );
+    }
 
     return $row;