From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 30 Oct 2013 20:52:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~565
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/1ccf4fb92fe71e9e2bc0baabfb2e92cd79166dae?hp=b944e8b1720552f02bea3363225e9625f099911f

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

diff --git a/sql/functions.sql b/sql/functions.sql
index 2407db5b..4c040fdc 100644
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -347,7 +347,7 @@ BEGIN
 
     w := getorcreate_word_id(s);
 
-    IF NOT (ARRAY[w] <@ result) THEN
+    IF w IS NOT NULL AND NOT (ARRAY[w] <@ result) THEN
       result := result || w;
     END IF;
 
@@ -415,7 +415,7 @@ BEGIN
 
   w := getorcreate_word_id(s);
 
-  IF NOT (ARRAY[w] <@ result) THEN
+  IF w IS NOT NULL AND NOT (ARRAY[w] <@ result) THEN
     result := result || w;
   END IF;