Merge branch 'staging' into production

Conflicts: app/models/session.rb

Merge branch 'staging' into production
Conflicts: app/models/session.rb
Victor Costa
2 parents 7d89cae4 a1e9a849
Showing 2 changed files with 11 additions and 1 deletions Show diff stats
app/models/session.rb
lib/authenticated_system.rb
 class Session < ActiveRecord::SessionStore::Session
  
   def self.find_by_session_id(session_id)
-    connection.clear_query_cache
     where(session_id: session_id).first
   end
  
@@ -23,6 +23,17 @@ 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
1	1	class Session < ActiveRecord::SessionStore::Session
2	2
3	3	def self.find_by_session_id(session_id)
4		- connection.clear_query_cache
5	4	where(session_id: session_id).first
6	5	end
7	6
...	...
...	...	@@ -23,6 +23,17 @@ module AuthenticatedSystem
23	23	def current_user
24	24	@current_user \|\|= begin
25	25	id = session[:user]
	26	+
	27	+ session_id = cookies[:_noosfero_session]
	28	+ if id.blank? && session_id.present?
	29	+ Session.connection.clear_query_cache
	30	+ session_obj = Session.where(session_id: session_id).first
	31	+ if session_obj.present?
	32	+ session = session_obj.data
	33	+ id = session_obj.user_id
	34	+ end
	35	+ end
	36	+
26	37	user = User.where(id: id).first if id
27	38	user.session = session if user
28	39	User.current = user
...	...