diff options
| author | Henrik Nygren <nygrenh@gmail.com> | 2015-02-25 14:28:08 +0200 |
|---|---|---|
| committer | Henrik Nygren <nygrenh@gmail.com> | 2015-02-25 17:02:22 +0200 |
| commit | ece0d25c2b64b1bc1f1b4b6343a7f5b909d75f06 (patch) | |
| tree | 1ed3d4f01343bfe0d1193dabed024ce3bcd35290 /activesupport/lib | |
| parent | 5a6868b6175167d91fcfaed82b4d4627281a4878 (diff) | |
| download | rails-ece0d25c2b64b1bc1f1b4b6343a7f5b909d75f06.tar.gz rails-ece0d25c2b64b1bc1f1b4b6343a7f5b909d75f06.tar.bz2 rails-ece0d25c2b64b1bc1f1b4b6343a7f5b909d75f06.zip | |
Fix a backtracking problem in String#truncate_words
Fixes #19070.
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/string/filters.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/filters.rb b/activesupport/lib/active_support/core_ext/string/filters.rb index 096292dc58..b88976eab2 100644 --- a/activesupport/lib/active_support/core_ext/string/filters.rb +++ b/activesupport/lib/active_support/core_ext/string/filters.rb @@ -93,7 +93,7 @@ class String def truncate_words(words_count, options = {}) sep = options[:separator] || /\s+/ sep = Regexp.escape(sep.to_s) unless Regexp === sep - if self =~ /\A((?:.+?#{sep}){#{words_count - 1}}.+?)#{sep}.*/m + if self =~ /\A((?>.+?#{sep}){#{words_count - 1}}.+?)#{sep}.*/m $1 + (options[:omission] || '...') else dup |