From 2c03609d704fa6f6c6922d57231119ed2c8c9644 Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Thu, 11 Feb 2016 14:38:06 -0300
Subject: [PATCH] Revert "Workaround for empty sessions with active record session store"

---
 app/models/session.rb       |  5 +++--
 lib/authenticated_system.rb | 11 -----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/app/models/session.rb b/app/models/session.rb
index 57f59ab..0cf82a5 100644
--- a/app/models/session.rb
+++ b/app/models/session.rb
@@ -1,7 +1,8 @@
 class Session < ActiveRecord::SessionStore::Session
 
-  def self.find_by_session_id(session_id)
-    where(session_id: session_id).first
+  # removed and redefined on super class
+  def self.find_by_session_id session_id
+    super
   end
 
   belongs_to :user
diff --git a/lib/authenticated_system.rb b/lib/authenticated_system.rb
index d207c7c..8726add 100644
--- a/lib/authenticated_system.rb
+++ b/lib/authenticated_system.rb
@@ -23,17 +23,6 @@ module AuthenticatedSystem
     def current_user
       @current_user ||= begin
         id = session[:user]
-
-        session_id = cookies[:_noosfero_session]
-        if id.blank? && session_id.present?
-          Session.connection.clear_query_cache
-          session_obj = Session.where(session_id: session_id).first
-          if session_obj.present?
-            session = session_obj.data
-            id = session_obj.user_id
-          end
-        end
-
         user = User.where(id: id).first if id
         user.session = session if user
         User.current = user
--
libgit2 0.21.2