aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorAditya Sanghi <asanghi@me.com>2010-10-15 22:43:01 +0530
committerSantiago Pastorino <santiago@wyeworks.com>2010-11-11 12:22:15 -0200
commit920660b19c5419c6df1c234a84e7fec71b169544 (patch)
tree621048196c2834c6fd7980bcd6f9c65453f94a6d /actionpack/lib/action_view
parent9c9f416d398c47dd2297fa5cc4025e0800d32212 (diff)
downloadrails-920660b19c5419c6df1c234a84e7fec71b169544.tar.gz
rails-920660b19c5419c6df1c234a84e7fec71b169544.tar.bz2
rails-920660b19c5419c6df1c234a84e7fec71b169544.zip
patching to ensure separator is printed with order [#5816 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/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 c1214bc44e..875ec9b77b 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -882,6 +882,8 @@ module ActionView
# Returns the separator for a given datetime component
def separator(type)
case type
+ when :year
+ @options[:discard_year] ? "" : @options[:date_separator]
when :month
@options[:discard_month] ? "" : @options[:date_separator]
when :day