X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/0892eab1d36b14fea8de73590c477612b5165ce6..986956e4b43c8ca1890125c9cafcbb97bcc5325a:/lib/TokenList.php

diff --git a/lib/TokenList.php b/lib/TokenList.php
index a91c735e..2d0c7c16 100644
--- a/lib/TokenList.php
+++ b/lib/TokenList.php
@@ -85,7 +85,7 @@ class TokenList
         $sSQL = 'SELECT word_id, word_token, word, class, type, country_code,';
         $sSQL .= ' operator, coalesce(search_name_count, 0) as count';
         $sSQL .= ' FROM word WHERE word_token in (';
-        $sSQL .= join(',', array_map('getDBQuoted', $aTokens)).')';
+        $sSQL .= join(',', $oDB->getDBQuotedList($aTokens)).')';
 
         Debug::printSQL($sSQL);
 
@@ -125,7 +125,7 @@ class TokenList
                         $iId,
                         $aWord['class'],
                         $aWord['type'],
-                        $aWord['operator'] ? Operator::NONE : Operator::NEAR
+                        $aWord['operator'] ? Operator::NEAR : Operator::NONE
                     );
                 }
             } elseif ($aWord['country_code']) {
@@ -138,7 +138,7 @@ class TokenList
             } else {
                 $oToken = new Token\Word(
                     $iId,
-                    $aWord['word'][0] != ' ',
+                    $aWord['word_token'][0] != ' ',
                     (int) $aWord['count']
                 );
             }