working on cleaning up and testing if I can push changes to a PR

2014-03-14 09:07:52 -04:00
parent b9f61b3686
commit 8daeee09f2
2 changed files with 3 additions and 2 deletions
@@ -9,7 +9,7 @@ class ApplicationController < ActionController::Base
  private

  def current_user
-    @current_user ||= User.find_by_auth_token(cookies[:auth_token].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