diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-12-20 18:39:41 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-12-20 18:39:41 +0000 |
| commit | 7f32a85464feb2a5c980e53491e0de83e3666f98 (patch) | |
| tree | de9a3e3ca4116d7074dce8fc97b649b840a217f9 /actionpack/lib | |
| parent | 9a27b29755027d7b2cb5e255276619485f4f5d02 (diff) | |
| download | rails-7f32a85464feb2a5c980e53491e0de83e3666f98.tar.gz rails-7f32a85464feb2a5c980e53491e0de83e3666f98.tar.bz2 rails-7f32a85464feb2a5c980e53491e0de83e3666f98.zip | |
Fix date helper :include_blank regression. Closes #3811. [mhw]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5759 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
| -rwxr-xr-x | actionpack/lib/action_view/helpers/date_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb index 6123cd9114..19dc90caa3 100755 --- a/actionpack/lib/action_view/helpers/date_helper.rb +++ b/actionpack/lib/action_view/helpers/date_helper.rb @@ -361,7 +361,7 @@ module ActionView defaults = { :discard_type => true } options = defaults.merge(options) datetime = value(object) - datetime ||= Time.now if options[:include_blank] + datetime ||= Time.now unless options[:include_blank] position = { :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6 } |