From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 30 Dec 2019 17:30:24 +0000 (+0100)
Subject: Fix error when searching for empty phrase (#12711)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=bb27ca14ef5e2b0b3108c476a62a0e6d559e070a;p=mastodon.git

Fix error when searching for empty phrase (#12711)

Fix #12619
---

diff --git a/app/lib/search_query_transformer.rb b/app/lib/search_query_transformer.rb
index 6a299f59d..e07ebfffe 100644
--- a/app/lib/search_query_transformer.rb
+++ b/app/lib/search_query_transformer.rb
@@ -78,7 +78,7 @@ class SearchQueryTransformer < Parslet::Transform
     elsif clause[:shortcode]
       TermClause.new(prefix, operator, ":#{clause[:term]}:")
     elsif clause[:phrase]
-      PhraseClause.new(prefix, operator, clause[:phrase].map { |p| p[:term].to_s }.join(' '))
+      PhraseClause.new(prefix, operator, clause[:phrase].is_a?(Array) ? clause[:phrase].map { |p| p[:term].to_s }.join(' ') : clause[:phrase].to_s)
     else
       raise "Unexpected clause type: #{clause}"
     end