diff options
| author | Andrew Mutz <andrew.mutz@gmail.com> | 2012-05-16 13:22:52 -0700 |
|---|---|---|
| committer | Andrew Mutz <andrew.mutz@gmail.com> | 2012-05-18 11:56:18 -0700 |
| commit | 2c423b3f3f0d489b0e9943b69f5b25d97006ca74 (patch) | |
| tree | b5ca003d51784280ee77889bd92de9001c8afe61 /actionpack/lib/action_view/helpers | |
| parent | 476ef2df74e1fb3646780950a3be1af85aa43adc (diff) | |
| download | rails-2c423b3f3f0d489b0e9943b69f5b25d97006ca74.tar.gz rails-2c423b3f3f0d489b0e9943b69f5b25d97006ca74.tar.bz2 rails-2c423b3f3f0d489b0e9943b69f5b25d97006ca74.zip | |
reverting decoupling of NumberHelper from safe_join and adding tests for escaping of delimiters and separators
Diffstat (limited to 'actionpack/lib/action_view/helpers')
| -rw-r--r-- | actionpack/lib/action_view/helpers/number_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb index 62455b97f9..dfc26acfad 100644 --- a/actionpack/lib/action_view/helpers/number_helper.rb +++ b/actionpack/lib/action_view/helpers/number_helper.rb @@ -254,7 +254,7 @@ module ActionView parts = number.to_s.to_str.split('.') parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{options[:delimiter]}") - parts.join(options[:separator]).html_safe + safe_join(parts, options[:separator]) end # Formats a +number+ with the specified level of |