diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-25 12:11:46 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-25 12:12:31 -0300 |
| commit | 2abed7af6e4b87da7277952e9ad73681ac337f2e (patch) | |
| tree | 4d547390e31bc464781dc5c46758ba6ac3e0b9d3 /activesupport/lib | |
| parent | d6c34ce59f57c6ef4101ba76efdb4df6893d6f9c (diff) | |
| parent | ece0d25c2b64b1bc1f1b4b6343a7f5b909d75f06 (diff) | |
| download | rails-2abed7af6e4b87da7277952e9ad73681ac337f2e.tar.gz rails-2abed7af6e4b87da7277952e9ad73681ac337f2e.tar.bz2 rails-2abed7af6e4b87da7277952e9ad73681ac337f2e.zip | |
Merge pull request #19076 from nygrenh/truncate-words-fix
Fix a backtracking problem in String#truncate_words
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 |