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

Timestamp:

04/07/2017 05:20:45 AM (8 years ago)

Author:

iandunn

Message:

Events: Restore original $location_name variable for re-use

The unmodified name will be required in an upcoming commit. Additionally, code is more self-documenting and clear when variables aren't re-purposed.

Since these lines are already being modified, go ahead and improve the formatting, to make them more readable.

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

@@ -2 +2 @@
 
 namespace Dotorg\API\Events;
+use stdClass;
 
 /**
@@ -169 +170 @@
 }
 
+/**
+ * Look for the given location in the Geonames database
+ *
+ * @param string $location_name
+ * @param string $timezone
+ * @param string $country
+ *
+ * @return stdClass|null
+ */
 function guess_location_from_geonames( $location_name, $timezone, $country ) {
     global $wpdb;
@@ -175 +185 @@
     // And we sort by population desc, assuming that the biggest matching location is the most likely one.
 
-    // Strip quotes from the search query and enclose it in double quotes, to force an exact literal search
-    $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 ) );
+    // Strip all quotes from the search query, and then enclose it in double quotes, to force an exact literal search
+    $quoted_location_name = sprintf(
+        '"%s"',
+        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",
+        $quoted_location_name,
+        $country,
+        $timezone
+    ) );
 
     return $row;