aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2011-10-25 17:22:55 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2011-10-25 17:22:55 -0500
commit1d9ab88ee6360f54197ce21624d844425ec627b3 (patch)
tree252b3daf0d84e2a050c0da97b758f9ba06a3545e /actionpack/lib/action_view/helpers
parent5daf07704ad21d885661216281ffc48b6ea6adfb (diff)
parent8aabdc69b7c498770e4c2864dad3e2790a40d10f (diff)
downloadrails-1d9ab88ee6360f54197ce21624d844425ec627b3.tar.gz
rails-1d9ab88ee6360f54197ce21624d844425ec627b3.tar.bz2
rails-1d9ab88ee6360f54197ce21624d844425ec627b3.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-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 ec6c2c8db3..7031694af4 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -69,7 +69,7 @@ module ActionView
number.gsub!(/(\d{1,3})(\d{3})(\d{4}$)/,"(\\1) \\2#{delimiter}\\3")
else
number.gsub!(/(\d{0,3})(\d{3})(\d{4})$/,"\\1#{delimiter}\\2#{delimiter}\\3")
- number.slice!(0, 1) if number.starts_with?('-')
+ number.slice!(0, 1) if number.starts_with?(delimiter) && !delimiter.blank?
end
str = []