X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/0ba16baba0615dd405486c7d87f943d71518375c..fe388980b431aef835eaf43f4547e51f763c3f4b:/forum_modules/pgfulltext/handlers.py

diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py
index ff29f14..e46c571 100644
--- a/forum_modules/pgfulltext/handlers.py
+++ b/forum_modules/pgfulltext/handlers.py
@@ -4,7 +4,7 @@ from forum.modules.decorators import decorate
 
 @decorate(QuestionManager.search, needs_origin=False)
 def question_search(self, keywords):
-    tsquery = " | ".join(keywords.split(' '))
+    tsquery = " | ".join([k for k in keywords.split(' ') if k])
     
     return self.extra(
                     tables = ['forum_rootnode_doc'],
@@ -15,7 +15,7 @@ def question_search(self, keywords):
                     },
                     where=["""
                            "forum_rootnode_doc"."node_id" = "forum_node"."id" AND ("forum_rootnode_doc"."document" @@ to_tsquery('english', %s) OR
-                           "forum_node"."title" ILIKE '""" + keywords + """%%')
+                           "forum_node"."title" ILIKE '""" + keywords.replace("'",r"\'") + """%%')
                            """],
                     params=[tsquery],
                     select_params=[tsquery],