making sure this is up to date

2014-03-14 14:00:51 -04:00
parent ec8a187833
commit d0e825fc17
4 changed files with 40 additions and 7 deletions
@@ -9,7 +9,10 @@ class ApplicationController < ActionController::Base
  private

  def current_user
-    @current_user ||= (User.find_by_auth_token(cookies[:auth_token].to_s) || User.find_by_user_id(session[:user_id].to_s))
+    @current_user ||= (
+      User.find_by_auth_token(cookies[:auth_token].to_s) || 
+      User.find_by_user_id(session[:user_id].to_s)
+    )
  end

  def authenticated