aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-10-13 16:26:55 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-10-13 16:26:55 -0700
commita5b0f914f16aac806a157dd4b6f3e3f3656d8396 (patch)
tree1160f1434eea0f0d1ab5f95600e7ffad0e72f377 /actionpack/lib/action_view
parent8cbe826958f78e5de5723bcbd3c90ea381a79e48 (diff)
parent20728f551c2a429fc7c29c6ac17b3f44b57526b9 (diff)
downloadrails-a5b0f914f16aac806a157dd4b6f3e3f3656d8396.tar.gz
rails-a5b0f914f16aac806a157dd4b6f3e3f3656d8396.tar.bz2
rails-a5b0f914f16aac806a157dd4b6f3e3f3656d8396.zip
Merge pull request #3314 from macmartine/master
Remove user-specified delimiter from start when no area code is present (in number_to_phone)
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 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 = []