diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-01-20 14:27:18 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-01-20 14:32:07 -0300 |
| commit | 01b4a7c1f4943e9600062de041a4c59c7b0e2ab1 (patch) | |
| tree | 1dfe45dfabfea30467cdf36be00b9743651452dc | |
| parent | a2d0b9945740ebd6a21debf2449e6522977d510c (diff) | |
| download | rails-01b4a7c1f4943e9600062de041a4c59c7b0e2ab1.tar.gz rails-01b4a7c1f4943e9600062de041a4c59c7b0e2ab1.tar.bz2 rails-01b4a7c1f4943e9600062de041a4c59c7b0e2ab1.zip | |
No need to check html_safe? twice
| -rw-r--r-- | actionpack/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/number_helper.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 33b02efa04..5e78aba0cc 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,7 @@ ## Rails 4.0.0 (unreleased) ## +* Add `:format` option to number_to_percentage *Rodrigo Flores* + * Add `config.action_view.logger` to configure logger for ActionView. *Rafael França* * Deprecated ActionController::Integration in favour of ActionDispatch::Integration diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb index 56a045fec5..c560750927 100644 --- a/actionpack/lib/action_view/helpers/number_helper.rb +++ b/actionpack/lib/action_view/helpers/number_helper.rb @@ -205,8 +205,7 @@ module ActionView if options[:raise] raise else - formatted_number = e.number.to_s.html_safe? ? format.gsub(/%n/, e.number).html_safe : format.gsub(/%n/, e.number) - formatted_number.html_safe? ? formatted_number.html_safe : formatted_number + e.number.to_s.html_safe? ? format.gsub(/%n/, e.number).html_safe : format.gsub(/%n/, e.number) end end end |