aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-01-24 15:06:27 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-01-24 15:06:27 -0800
commit1d67f1ade761db75bceb30d914c4280cc3dbc984 (patch)
treeb642fb4ff0d6168304bcb0e4fd8c433e84959683 /actionpack/lib
parentdc81d0054bc5f2eba6f65c32e112a4859a302f29 (diff)
parent59a408eb64729909aca15ef59291aea2cef951e2 (diff)
downloadrails-1d67f1ade761db75bceb30d914c4280cc3dbc984.tar.gz
rails-1d67f1ade761db75bceb30d914c4280cc3dbc984.tar.bz2
rails-1d67f1ade761db75bceb30d914c4280cc3dbc984.zip
Merge pull request #4639 from joevandyk/datetime-infinity-select-fix
datetime_select fix for dates of -infinity and +infinity
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/date_helper.rb2
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 656564c106..2b128e8445 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -783,7 +783,7 @@ module ActionView
private
%w( sec min hour day month year ).each do |method|
define_method(method) do
- @datetime.kind_of?(Fixnum) ? @datetime : @datetime.send(method) if @datetime
+ @datetime.kind_of?(Numeric) ? @datetime : @datetime.send(method) if @datetime
end
end