diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-05-19 18:24:16 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-05-19 18:24:16 -0300 |
| commit | c5205041f65206a1490063b08915e7b2a2151a61 (patch) | |
| tree | 83f11f5c87e713e2ffbc78949c15c26a15a0e837 /actionpack/lib | |
| parent | 879611f50c76f79258e5925de113d9f8f8a5b418 (diff) | |
| download | rails-c5205041f65206a1490063b08915e7b2a2151a61.tar.gz rails-c5205041f65206a1490063b08915e7b2a2151a61.tar.bz2 rails-c5205041f65206a1490063b08915e7b2a2151a61.zip | |
Use right option for excerpt text helper in tests, fix build
`excerpt` text helper uses `:radius`, not `line_width` (that is used by
`word_wrap` helper).
Also cleanup some whitespaces.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/text_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index 1834b88532..3490b1f34f 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -113,7 +113,7 @@ module ActionView unless args.empty? ActiveSupport::Deprecation.warn "Calling highlight with a highlighter as an argument is deprecated. " \ "Please call with :highlighter => '#{args[0]}' instead.", caller - + options[:highlighter] = args[0] || '<strong class="highlight">\1</strong>' end options.reverse_merge!(:highlighter => '<strong class="highlight">\1</strong>') @@ -161,7 +161,7 @@ module ActionView unless args.empty? ActiveSupport::Deprecation.warn "Calling excerpt with radius and omission as arguments is deprecated. " \ "Please call with :radius => #{args[0]}#{", :omission => '#{args[1]}'" if args[1]} instead.", caller - + options[:radius] = args[0] || 100 options[:omission] = args[1] || "..." end |