about summary refs log tree commit diff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-11-30 15:32:26 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-11-30 15:32:26 +0100
commit356d3874ebd79573a8da58e2ac76eaa4612cec16 (patch)
treeb76762284e00bc386702a01fc70d9d04e235ac13 /app/controllers/application_controller.rb
parent4a2347da41278999c0e7441bcd7c5a42a67ba0ee (diff)
Normalize localizations, add stub for admin/accounts
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index bb52646a7..5243bc446 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -37,7 +37,7 @@ class ApplicationController < ActionController::Base
   end
 
   def set_user_activity
-    current_user.touch(:current_sign_in_at) if !current_user.nil? && current_user.current_sign_in_at < 24.hours.ago
+    current_user.touch(:current_sign_in_at) if !current_user.nil? && (current_user.current_sign_in_at.nil? || current_user.current_sign_in_at < 24.hours.ago)
   end
 
   protected