Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / search.php

diff --git a/website/search.php b/website/search.php
index ed67b4196401f5fb03e831aa6c4cbe035a8c5e17..5733dde48a8f08b6e9f909b2b02c8633e0d64415 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -154,7 +154,7 @@
                                array('county', 9, 13),
                                array('state', 8, 8),
                                array('country', 4, 4),
-                               array('postalcode', 16, 25),
+                               array('postalcode', 5, 11),
                                );
        $aStructuredQuery = array();
        $sAllowedTypesSQLList = '';
@@ -309,7 +309,7 @@
                                $aSpecialTerms[strtolower($aSpecialTerm[1])] = $aSpecialTerm[2];
                        }
 
-                       preg_match_all('/\\[([a-zA-Z]*)\\]/', $sQuery, $aSpecialTermsRaw, PREG_SET_ORDER);
+                       preg_match_all('/\\[([\\w ]*)\\]/u', $sQuery, $aSpecialTermsRaw, PREG_SET_ORDER);
                        $aSpecialTerms = array();
                        if (isset($aStructuredQuery['amenity']) && $aStructuredQuery['amenity'])
                        {