diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-05-08 09:43:33 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-05-08 09:43:33 -0500 |
| commit | 143878d9dadd03347c54c9261b9bc754a1d0f5bc (patch) | |
| tree | 0643b1ff72e35e4ea61209e8320a060879951744 /app/models | |
| parent | 7600067a300b650a6f30da19a469c913243f3a13 (diff) | |
| parent | 919e2098cb7c2ff30e19ab4f4e4c8ec9506d230d (diff) | |
Merge remote-tracking branch 'glitchsoc/master' into gs-master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/glitch/keyword_mute.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/glitch/keyword_mute.rb b/app/models/glitch/keyword_mute.rb index f9c380f39..17ebc5b5e 100644 --- a/app/models/glitch/keyword_mute.rb +++ b/app/models/glitch/keyword_mute.rb @@ -70,7 +70,7 @@ class Glitch::KeywordMute < ApplicationRecord def make_regex_text kws = keywords.map! do |whole_word, keyword| - whole_word ? boundary_regex_for_keyword(keyword) : /(?i:#{keyword})/ + whole_word ? boundary_regex_for_keyword(keyword) : /(?i:#{Regexp.escape(keyword)})/ end Regexp.union(kws).source |