diff options
| -rw-r--r-- | actionpack/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/number_helper.rb | 3 | ||||
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/read.rb | 5 |
3 files changed, 7 insertions, 3 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 diff --git a/activerecord/lib/active_record/attribute_methods/read.rb b/activerecord/lib/active_record/attribute_methods/read.rb index a7c86f8f74..964c4123ef 100644 --- a/activerecord/lib/active_record/attribute_methods/read.rb +++ b/activerecord/lib/active_record/attribute_methods/read.rb @@ -126,7 +126,10 @@ module ActiveRecord self.class.type_cast_attribute(attr_name, @attributes, @attributes_cache) end - alias :attribute :read_attribute + private + def attribute(attribute_name) + read_attribute(attribute_name) + end end end end |