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

when looking for keywords on detail page a SQL bracket error was possible

Browse Source
This commit is contained in:
marc tobias
2018-04-06 13:46:14 +02:00
parent 62719f58c9
commit 908c66ca84
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/details.php
View File

@@ -210,11 +210,12 @@ $aPlaceSearchNameKeywords = false;
$aPlaceSearchAddressKeywords = false; $aPlaceSearchAddressKeywords = false;
if ($oParams->getBool('keywords')) { if ($oParams->getBool('keywords')) {
$sSQL = "SELECT * FROM search_name WHERE place_id = $iPlaceID"; $sSQL = "SELECT * FROM search_name WHERE place_id = $iPlaceID";
$aPlaceSearchName = $oDB->getRow($sSQL); $aPlaceSearchName = $oDB->getRow($sSQL); // can be null
if (PEAR::isError($aPlaceSearchName)) { // possible timeout if (!$aPlaceSearchName || PEAR::isError($aPlaceSearchName)) { // possible timeout
$aPlaceSearchName = []; $aPlaceSearchName = [];
} }
if (!empty($aPlaceSearchName)) {
$sSQL = 'SELECT * FROM word WHERE word_id in ('.substr($aPlaceSearchName['name_vector'], 1, -1).')'; $sSQL = 'SELECT * FROM word WHERE word_id in ('.substr($aPlaceSearchName['name_vector'], 1, -1).')';
$aPlaceSearchNameKeywords = $oDB->getAll($sSQL); $aPlaceSearchNameKeywords = $oDB->getAll($sSQL);
if (PEAR::isError($aPlaceSearchNameKeywords)) { // possible timeout if (PEAR::isError($aPlaceSearchNameKeywords)) { // possible timeout
@@ -227,6 +228,7 @@ if ($oParams->getBool('keywords')) {
$aPlaceSearchAddressKeywords = []; $aPlaceSearchAddressKeywords = [];
} }
} }
}
logEnd($oDB, $hLog, 1); logEnd($oDB, $hLog, 1);