Merge branch 'master' of github.com:danielweinmann/catarse

faulkner · Feb 14, 2012 · 117f67b · 117f67b
2 parents 29e9e13 + f4c9135
commit 117f67b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -60,7 +60,7 @@ def current_user
     if cookies[:remember_me_id] and cookies[:remember_me_hash]
       @current_user = User.find(cookies[:remember_me_id])
       @current_user = nil unless @current_user.remember_me_hash == cookies[:remember_me_hash]
-      session[:user_id] = @current_user.id
+      return session[:user_id] = @current_user.id
     end
     return @current_user = request.env['warden'].authenticate(:user) rescue nil
   rescue Exception => e