Revert stuff

2015-04-28 16:48:52 +02:00
parent 23ddfaca11
commit c39fd9d6ce
2 changed files with 3 additions and 6 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -10,11 +10,8 @@ class ApplicationController < ActionController::Base
  rescue_from Pundit::NotAuthorizedError, with: :render_not_authorized

  def current_user
-    ::NewRelic::Agent.add_custom_parameters({ external_user_id: :session[:external_user_id], session_user_id: session[:user_id] })
+    ::NewRelic::Agent.add_custom_parameters({ external_user_id: session[:external_user_id], session_user_id: session[:user_id] })
    @current_user ||= ExternalUser.find_by(id: session[:external_user_id]) || login_from_session || login_from_other_sources
-    if @current_user == false
-      @current_user = nil
-    end
  end

  def help