safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

fix more syntax issues

Browse Source
This commit is contained in:
Sarah Hoffmann
2017-10-08 16:42:04 +02:00
parent fd08d41962
commit 795153b213
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Geocode.php
View File

@@ -741,12 +741,15 @@ class Geocode
// If the token is valid
if (isset($aValidTokens[' '.$sToken])) {
// Recheck if the original word shows up in the query.
$bWordInQuery = false;
if (isset($aSearchTerm['word']) && $aSearchTerm['word']) {
$bWordInQuery = $this->normTerm($aSearchTerm['word']) !== false;
}
foreach ($aValidTokens[' '.$sToken] as $aSearchTerm) {
// Recheck if the original word shows up in the query.
$bWordInQuery = false;
if (isset($aSearchTerm['word']) && $aSearchTerm['word']) {
$bWordInQuery = strpos(
$sNormQuery,
$this->normTerm($aSearchTerm['word'])
) !== false;
}
$aNewSearches = $oCurrentSearch->extendWithFullTerm(
$aSearchTerm,
$bWordInQuery,
@@ -1180,7 +1183,7 @@ class Geocode
);
} elseif ($oSearch->isOperator(Operator::POSTCODE)) {
$aPlaceIDs = $oSearch->queryPostcode(
$oDB,
$this->oDB,
$sCountryCodesSQL,
$this->iLimit
);