<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[6818] sites/trunk/api.wordpress.org/public_html/events/1.0: Events: Switch to `utf8` charset when querying `geoname_summary`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/6818">6818</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/6818","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-03-01 21:13:34 +0000 (Thu, 01 Mar 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Events: Switch to `utf8` charset when querying `geoname_summary`.
This is in conjunction with altering the table schema as described in <a href="http://meta.trac.wordpress.org/ticket/3295">#3295</a>:comment:8.
Props Otto42, dd32, iandunn.
Fixes <a href="http://meta.trac.wordpress.org/ticket/3295">#3295</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlevents10indexphp">sites/trunk/api.wordpress.org/public_html/events/1.0/index.php</a></li>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlevents10teststestindexphp">sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmlevents10indexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/events/1.0/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/events/1.0/index.php 2018-03-01 21:13:29 UTC (rev 6817)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/index.php 2018-03-01 21:13:34 UTC (rev 6818)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,7 +281,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // And we sort by population desc, assuming that the biggest matching location is the most likely one.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Exact match
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $row = $wpdb->get_row( $wpdb->prepare( "
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query = "
</ins><span class="cx" style="display: block; padding: 0 10px"> SELECT name, latitude, longitude, country
</span><span class="cx" style="display: block; padding: 0 10px"> FROM geoname_summary
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE name = %s
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -289,15 +289,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> FIELD( %s, country ) DESC,
</span><span class="cx" style="display: block; padding: 0 10px"> FIELD( %s, timezone ) DESC,
</span><span class="cx" style="display: block; padding: 0 10px"> population DESC
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- LIMIT 1",
- $location_name,
- $country,
- $timezone
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ LIMIT 1";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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.
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Wildcard match
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $row && $wildcard && 'ASCII' !== mb_detect_encoding( $location_name ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $row = $wpdb->get_row( $wpdb->prepare( "
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query = "
</ins><span class="cx" style="display: block; padding: 0 10px"> SELECT name, latitude, longitude, country
</span><span class="cx" style="display: block; padding: 0 10px"> FROM geoname_summary
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE name LIKE %s
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,11 +308,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> FIELD( %s, country ) DESC,
</span><span class="cx" style="display: block; padding: 0 10px"> FIELD( %s, timezone ) DESC,
</span><span class="cx" style="display: block; padding: 0 10px"> population DESC
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- LIMIT 1",
- $wpdb->esc_like( $location_name ) . '%',
- $country,
- $timezone
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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.
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Suffix the "State", good in some countries (western countries) horrible in others
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,6 +325,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // $row->name .= ', ' . $row->state;
</span><span class="cx" style="display: block; padding: 0 10px"> // }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Strip off null bytes
+ // @todo Modify geoname script to to this instead?
+ if ( ! empty( $row->name ) ) {
+ $row->name = trim( $row->name );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $row;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmlevents10teststestindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php 2018-03-01 21:13:29 UTC (rev 6817)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php 2018-03-01 21:13:34 UTC (rev 6818)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +189,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'Africa/Nairobi',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'nairobi',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => 'naíróbí',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '-1.283',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '36.817',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'KE',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,7 +203,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'Asia/Tokyo',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'tokyo',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => 'tōkyō',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '35.690',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '139.692',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'JP',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,7 +217,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'Europe/Berlin',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'berlin',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => 'berlín',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '52.524',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '13.411',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'DE',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -347,7 +347,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'America/Denver',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => "dona ana",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => "doña ana",
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '32.390',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '-106.814',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'US',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,7 +396,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'Africa/Douala',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'yaoundé',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => 'yaounde',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '3.867',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '11.517',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'CM',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -566,7 +566,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'America/Mexico_City',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'ciudad de méxico',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => 'ciudad de mexico',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '19.428',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '-99.128',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'MX',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -594,7 +594,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'America/Bogota',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'bogotá',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => 'bogota',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '4.610',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '-74.082',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'CO',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -627,7 +627,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'timezone' => 'America/Sao_Paulo',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => 'são paulo',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => 'sao',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => '-23.548',
</span><span class="cx" style="display: block; padding: 0 10px"> 'longitude' => '-46.636',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'BR',
</span></span></pre>
</div>
</div>
</body>
</html>