Follow-up to #16560

For the sake of backward-compatibility, we need to make #instance_of?
return true for Fixnum. On the other hand, the method should still
give true for ActiveSupport::Duration itself which was not the case
before.

1 files changed, 2 insertions, 2 deletions

diff --git a/activesupport/lib/active_support/duration.rb b/activesupport/lib/active_support/duration.rb
index 084d13a9e3..1a6c02a39b 100644
--- a/activesupport/lib/active_support/duration.rb
+++ b/activesupport/lib/active_support/duration.rb
@@ -35,12 +35,12 @@ module ActiveSupport
     end
 
     def is_a?(klass) #:nodoc:
-      instance_of?(klass) || value.is_a?(klass)
+      Duration == klass || value.is_a?(klass)
     end
     alias :kind_of? :is_a?
 
     def instance_of?(klass) # :nodoc:
-      Duration == klass
+      Duration == klass || value.instance_of?(klass)
     end
 
     # Returns +true+ if +other+ is also a Duration instance with the