aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-04-30 06:05:08 -0700
committerJosé Valim <jose.valim@gmail.com>2012-04-30 06:05:08 -0700
commit02741121be86e2e5a83f10e8dc15be6700c62de4 (patch)
tree576ad3076a5036940611c91969dcff3e08077223 /actionpack/lib
parent63c00ba558e8c5fe02da98b2d06cf97448c99155 (diff)
parent57d9f8b924039ed5f57fc3e9cad640c5c61eb84b (diff)
downloadrails-02741121be86e2e5a83f10e8dc15be6700c62de4.tar.gz
rails-02741121be86e2e5a83f10e8dc15be6700c62de4.tar.bz2
rails-02741121be86e2e5a83f10e8dc15be6700c62de4.zip
Merge pull request #3726 from JanDupal/fix-date-helper-hidden
fix Helpers::DateHelper with :use_hidden - hide separators
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/date_helper.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 76ffb0657b..6ed265a516 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -1011,6 +1011,8 @@ module ActionView
# Returns the separator for a given datetime component.
def separator(type)
+ return "" if @options[:use_hidden]
+
case type
when :year, :month, :day
@options[:"discard_#{type}"] ? "" : @options[:date_separator]