Merge pull request #1002 from mtmail/sql-bracket-error-in-details

when looking for keywords on detail page SQL bracket error was possible
This commit is contained in:
Sarah Hoffmann 2018-04-06 21:09:52 +02:00 committed by GitHub
commit 49dc62201c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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