From 702325d2537b3f01d60171d89a5f4ff2d18e57cd Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Wed, 18 Nov 2020 16:50:06 +0100
Subject: [PATCH] Fix suburl check

Previous commit was a bit too simplistic to cover all cases
---
 pgweb/search/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pgweb/search/views.py b/pgweb/search/views.py
index db26bf4b..0cc379a9 100644
--- a/pgweb/search/views.py
+++ b/pgweb/search/views.py
@@ -130,7 +130,7 @@ def search(request):
                 'search_error': "No search term specified.",
             })
     query = request.GET['q'].strip()
-    if '\0' in query or '\0' in suburl:
+    if '\0' in query or ((not searchlists) and suburl and '\0' in suburl):
         return render(request, 'search/sitesearch.html', {
             'search_error': "Invalid character in search.",
         })
-- 
2.39.5