aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/user_controller.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/user_controller.rb')
-rw-r--r--app/controllers/user_controller.rb17
1 files changed, 1 insertions, 16 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 43eb99c58..56f42891d 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -7,15 +7,8 @@
require 'set'
class UserController < ApplicationController
-
layout :select_layout
- protect_from_forgery :only => [ :contact,
- :set_profile_photo,
- :signchangeemail,
- :clear_profile_photo,
- :set_profile_about_me ] # See ActionController::RequestForgeryProtection for details
-
# Show page about a user
def show
long_cache
@@ -260,16 +253,8 @@ class UserController < ApplicationController
do_post_redirect post_redirect
end
- # Logout form
- def _do_signout
- session[:user_id] = nil
- session[:user_circumstance] = nil
- session[:remember_me] = false
- session[:using_admin] = nil
- session[:admin_name] = nil
- end
def signout
- self._do_signout
+ clear_session_credentials
if params[:r]
redirect_to URI.parse(params[:r]).path
else