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

Timestamp:

11/26/2020 04:26:18 AM (4 years ago)

Author:

dd32

Message:

Events API: remove the UTF8 database connection juggling, which shouldn't be needed anymore.

See #3728.

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

@@ -1 +1 @@
 <?php
-
 namespace Dotorg\API\Events;
 use stdClass;
@@ -358 +357 @@
         LIMIT 1';
 
-    $prepared_query = $wpdb->prepare( $query, $location_name, $country, $timezone, $location_name );
-    $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.
+    $row = $wpdb->get_row( $wpdb->prepare(
+        $query,
+        $location_name,
+        $country,
+        $timezone,
+        $location_name
+    ) );
 
     // Wildcard match
@@ -378 +378 @@
             LIMIT 1';
 
-        $prepared_query = $wpdb->prepare( $query, $wpdb->esc_like( $location_name ) . '%', $country, $timezone, $location_name, mb_strlen( $location_name ) );
-        $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.
-    }
-
-    // Suffix the "State", good in some countries (western countries) horrible in others
-    // (where geonames data is not as complete, or region names are similar (but not quite the same) to city names)
-    // LEFT JOIN admin1codes ac ON gs.statecode = ac.code
-    // if ( $row->state && $row->state != $row->name && $row->name NOT CONTAINED WITHIN $row->state? ) {
-    //   $row->name .= ', ' . $row->state;
-    // }
+        $row = $wpdb->get_row( $wpdb->prepare(
+            $query,
+            $wpdb->esc_like( $location_name ) . '%',
+            $country,
+            $timezone,
+            $location_name,
+            mb_strlen( $location_name )
+        ) );
+    }
 
     // Strip off null bytes