correctly quote regular expression

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 9ee812d4ecd57b0e1b12e2f8f65bd80f6b5bcb98..dfb3af2ae823c60eabe816bcc3af2d6c7bb651f1 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1591,9 +1591,11 @@
                        $aRecheckWords = preg_split('/\b[\s,\\-]*/u',$sQuery);
                        foreach($aRecheckWords as $i => $sWord)
                        {
-                               if (!$sWord) unset($aRecheckWords[$i]);
+                               if (!preg_match('/\pL/', $sWord)) unset($aRecheckWords[$i]);
                        }
 
+            if (CONST_Debug) { echo '<i>Recheck words:<\i>'; var_dump($aRecheckWords); }
+
                        foreach($aSearchResults as $iResNum => $aResult)
                        {
                                if (CONST_Search_AreaPolygons)
@@ -1752,7 +1754,7 @@
                                        if (stripos($sAddress, $sWord)!==false)
                                        {
                                                $iCountWords++;
-                                               if (preg_match("/(^|,)\s*$sWord\s*(,|$)/", $sAddress)) $iCountWords += 0.1;
+                                               if (preg_match("/(^|,)\s*".preg_quote($sWord, '/')."\s*(,|$)/", $sAddress)) $iCountWords += 0.1;
                                        }
                                }