diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-04 22:54:06 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-04 23:04:42 +0100 |
| commit | 01eaeab56df4da4c697b1096f40a400cc9e2b8e8 (patch) | |
| tree | 6288ee106b4615cacd98362f9fd268317a9cdeff /app/lib | |
| parent | 22daf24600d8e99e4569740ee5836d25c70c1e8b (diff) | |
| parent | 2ecc7802caf4d272191a7fd582fc97996f750827 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/search_query_transformer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |