diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-01-18 01:43:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-18 01:43:16 -0500 |
| commit | a4dbbde4c91a52e28b6c4772b0032b9c16d636ca (patch) | |
| tree | d0efee32f11662beb7a90e7710f1d5cba819ae52 /actionview/lib | |
| parent | 0e119480fca1d830bcfcf01ada041d890ba82325 (diff) | |
| parent | 8040f527c3f75638829809662a52af04d50369f9 (diff) | |
| download | rails-a4dbbde4c91a52e28b6c4772b0032b9c16d636ca.tar.gz rails-a4dbbde4c91a52e28b6c4772b0032b9c16d636ca.tar.bz2 rails-a4dbbde4c91a52e28b6c4772b0032b9c16d636ca.zip | |
Merge pull request #27693 from kenta-s/improve-to_sentence-method
Fix unexpected behavior of `to_sentence` with $,
Diffstat (limited to 'actionview/lib')
| -rw-r--r-- | actionview/lib/action_view/helpers/output_safety_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/output_safety_helper.rb b/actionview/lib/action_view/helpers/output_safety_helper.rb index e9febb8be9..25defd1276 100644 --- a/actionview/lib/action_view/helpers/output_safety_helper.rb +++ b/actionview/lib/action_view/helpers/output_safety_helper.rb @@ -60,7 +60,7 @@ module ActionView #:nodoc: when 2 safe_join([array[0], array[1]], options[:two_words_connector]) else - safe_join([safe_join(array[0...-1], options[:words_connector]), options[:last_word_connector], array[-1]]) + safe_join([safe_join(array[0...-1], options[:words_connector]), options[:last_word_connector], array[-1]], nil) end end end |