diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-20 09:38:46 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-20 09:38:46 -0800 |
| commit | 712b0b99a273c49fb4fad48ae61b4ce252ec0562 (patch) | |
| tree | b60ca6ce042703401cd553ba83332c1b2f650699 /actionpack/lib/action_view | |
| parent | 79f7bbb0032bdd1200110348d7cd43af986ee6f3 (diff) | |
| parent | 01b4a7c1f4943e9600062de041a4c59c7b0e2ab1 (diff) | |
| download | rails-712b0b99a273c49fb4fad48ae61b4ce252ec0562.tar.gz rails-712b0b99a273c49fb4fad48ae61b4ce252ec0562.tar.bz2 rails-712b0b99a273c49fb4fad48ae61b4ce252ec0562.zip | |
Merge pull request #4557 from rafaelfranca/av-number_helper-refactor
No need to check html_safe? twice at number_to_percentage
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/number_helper.rb | 3 |
1 files changed, 1 insertions, 2 deletions
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 |