lib/google_otg.rb in google_otg-1.1.1 vs lib/google_otg.rb in google_otg-1.1.2

@@ -215,10 +215,12 @@
 
         end
 
         # override this if you have a better way of retrieving time zones
         def get_time_zone
-          return defined?(current_user) && !current_user.nil? && current_user.responds_to?(:time_zone) ? current_user.time_zone : ActiveSupport::TimeZone["UTC"]
+          return current_user.time_zone if defined?(current_user) && current_user.respond_to?(:time_zone)
+          return @current_user.time_zone if defined?(@current_user) && @current_user.respond_to?(:time_zone)
+          return ActiveSupport::TimeZone["UTC"]
         end
 
         def setup_time_range()
             time_zone = get_time_zone