Fixing problem with no Time.zone

joeyAghion · May 12, 2010 · 19d4c50 · 19d4c50
1 parent 4eaa2af
commit 19d4c50
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 44 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.8.5
+1.8.4.2
diff --git a/delayed_job.gemspec b/delayed_job.gemspec
diff --git a/lib/delayed/job.rb b/lib/delayed/job.rb
@@ -110,7 +110,7 @@ def self.enqueue(*args, &block)
       unless object.respond_to?(:perform) || block_given?
         raise ArgumentError, 'Cannot enqueue items which do not respond to perform'
       end
-    
+
       options = args.first || {}
       options[:priority] ||= 0
       options[:payload_object] = object
@@ -258,7 +258,7 @@ def attempt_to_load(klass)
     # Note: This does not ping the DB to get the time, so all your clients
     # must have syncronized clocks.
     def self.db_time_now
-      (ActiveRecord::Base.default_timezone == :utc) ? Time.now.utc : Time.zone.now
+      (ActiveRecord::Base.default_timezone == :utc) ? Time.now.utc : (Time.zone ? Time.zone.now : Time.now)
     end
 
   protected