aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorJosh Kalderimis <josh.kalderimis@gmail.com>2011-03-16 19:03:25 +0100
committerSantiago Pastorino <santiago@wyeworks.com>2011-03-16 15:11:00 -0300
commit0eae62525696b57fe7fc4bbb0bf9c0bc7ee4e480 (patch)
tree2159d4bf657f2b2d8136219bde286533979fdfd9 /actionpack/lib/action_view
parente8458d37c56a94fae5f4c762b1767f67e10ddb43 (diff)
downloadrails-0eae62525696b57fe7fc4bbb0bf9c0bc7ee4e480.tar.gz
rails-0eae62525696b57fe7fc4bbb0bf9c0bc7ee4e480.tar.bz2
rails-0eae62525696b57fe7fc4bbb0bf9c0bc7ee4e480.zip
fixes an issue with number_to_human when converting values which are less than 1 but greater than -1 [#6576 state:resolved]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/helpers/number_helper.rb2
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 4e44843c4b..05a9c5b4f1 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -472,7 +472,7 @@ module ActionView
end.keys.map{|e_name| inverted_du[e_name] }.sort_by{|e| -e}
number_exponent = number != 0 ? Math.log10(number.abs).floor : 0
- display_exponent = unit_exponents.find{|e| number_exponent >= e }
+ display_exponent = unit_exponents.find{ |e| number_exponent >= e } || 0
number /= 10 ** display_exponent
unit = case units