Merge pull request icalendar#98 from jeremyevans/master

Use more specific check for ActiveSupport timezone support
dringoen · Oct 23, 2014 · c9a0db5 · c9a0db5
2 parents 75b38be + e08db70
commit c9a0db5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/icalendar/values/time_with_zone.rb b/lib/icalendar/values/time_with_zone.rb
@@ -12,7 +12,7 @@ module TimeWithZone
       def initialize(value, params = {})
         @tz_utc = params['tzid'] == 'UTC'
 
-        if defined?(ActiveSupport) && !params['tzid'].nil?
+        if defined?(ActiveSupport::TimeZone) && defined?(ActiveSupport::TimeWithZone) && !params['tzid'].nil?
           tzid = params['tzid'].is_a?(::Array) ? params['tzid'].first : params['tzid']
           zone = ActiveSupport::TimeZone[tzid]
           value = ActiveSupport::TimeWithZone.new nil, zone, value unless zone.nil?