diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-12 13:25:04 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-12 13:25:04 -0300 |
| commit | 9c18beae641a954f818eeb8f349248341160debe (patch) | |
| tree | 78f9341e1e3de5580bb3f0f65c504118131a1eff /actionview/lib/action_view/helpers/text_helper.rb | |
| parent | 329721e35194958ba86832e995775d02bacf8bc7 (diff) | |
| parent | 061e48df26557bb0a667794df9772880846058cb (diff) | |
| download | rails-9c18beae641a954f818eeb8f349248341160debe.tar.gz rails-9c18beae641a954f818eeb8f349248341160debe.tar.bz2 rails-9c18beae641a954f818eeb8f349248341160debe.zip | |
Merge pull request #11603 from jetthoughts/join_strings_instead_of_contactination
Cleanup: replace String concatenation by joining for excerpt helper
Diffstat (limited to 'actionview/lib/action_view/helpers/text_helper.rb')
| -rw-r--r-- | actionview/lib/action_view/helpers/text_helper.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionview/lib/action_view/helpers/text_helper.rb b/actionview/lib/action_view/helpers/text_helper.rb index 3fc64fa8a5..c23d605c5f 100644 --- a/actionview/lib/action_view/helpers/text_helper.rb +++ b/actionview/lib/action_view/helpers/text_helper.rb @@ -150,7 +150,7 @@ module ActionView def excerpt(text, phrase, options = {}) return unless text && phrase - separator = options.fetch(:separator, "") + separator = options[:separator] || '' phrase = Regexp.escape(phrase) regex = /#{phrase}/i @@ -171,7 +171,8 @@ module ActionView prefix, first_part = cut_excerpt_part(:first, first_part, separator, options) postfix, second_part = cut_excerpt_part(:second, second_part, separator, options) - prefix + (first_part + separator + phrase + separator + second_part).strip + postfix + affix = [first_part, separator, phrase, separator, second_part].join.strip + [prefix, affix, postfix].join end # Attempts to pluralize the +singular+ word unless +count+ is 1. If |