Merge pull request #548 from lonvia/query-ckeck-utf8

check if query is valid unicode string

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 7ea39e4954b4aa9e84a3da84060fdf02766c70b1..03df675278b5b21d43780a7e905355780c592e43 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -908,6 +908,9 @@ class Geocode
         }
 
         $sQuery = $this->sQuery;
+        if (!preg_match('//u', $sQuery)) {
+            userError("Query string is not UTF-8 encoded.");
+        }
 
         // Conflicts between US state abreviations and various words for 'the' in different languages
         if (isset($this->aLangPrefOrder['name:en'])) {