diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-20 23:13:19 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-20 23:13:19 +0200 |
| commit | 207fa59675cb624dde0e01c1d57597f752cdf095 (patch) | |
| tree | 472d03af5bc3e2df1b759717f723ca914f2a77aa /actionpack/lib/action_view/helpers/date_helper.rb | |
| parent | 31cadc730a40281950a265ff6982dd76cc326828 (diff) | |
| parent | 50d37a76064239a731f81a4ba68b80946c4dfae2 (diff) | |
| download | rails-207fa59675cb624dde0e01c1d57597f752cdf095.tar.gz rails-207fa59675cb624dde0e01c1d57597f752cdf095.tar.bz2 rails-207fa59675cb624dde0e01c1d57597f752cdf095.zip | |
Merge remote branch 'rails/master'
Conflicts:
actionpack/lib/abstract_controller/base.rb
Diffstat (limited to 'actionpack/lib/action_view/helpers/date_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/date_helper.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb index 6f387bc95a..7d7b6a1d91 100644 --- a/actionpack/lib/action_view/helpers/date_helper.rb +++ b/actionpack/lib/action_view/helpers/date_helper.rb @@ -896,8 +896,10 @@ module ActionView # Returns the separator for a given datetime component def separator(type) case type - when :month, :day - @options[:date_separator] + when :month + @options[:discard_month] ? "" : @options[:date_separator] + when :day + @options[:discard_day] ? "" : @options[:date_separator] when :hour (@options[:discard_year] && @options[:discard_day]) ? "" : @options[:datetime_separator] when :minute |