From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 23 Sep 2020 07:21:09 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~213
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/b1b25d9a10ea7b97e12effc4313f140c17730c78?ds=sidebyside;hp=-c

Merge remote-tracking branch 'upstream/master'
---

b1b25d9a10ea7b97e12effc4313f140c17730c78
diff --combined lib/Geocode.php
index 3d6838b6,bc81bced..7ab53d97
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@@ -18,7 -18,7 +18,7 @@@ class Geocod
      protected $aLangPrefOrder = array();
  
      protected $aExcludePlaceIDs = array();
 -    protected $bReverseInPlan = false;
 +    protected $bReverseInPlan = true;
  
      protected $iLimit = 20;
      protected $iFinalLimit = 10;
@@@ -642,12 -642,6 +642,6 @@@
              $oValidTokens = new TokenList();
  
              if (!empty($aTokens)) {
-                 $sSQL = 'SELECT word_id, word_token, word, class, type, country_code, operator, search_name_count';
-                 $sSQL .= ' FROM word ';
-                 $sSQL .= ' WHERE word_token in ('.join(',', $this->oDB->getDBQuotedList($aTokens)).')';
- 
-                 Debug::printSQL($sSQL);
- 
                  $oValidTokens->addTokensFromDB(
                      $this->oDB,
                      $aTokens,