aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/user_controller.rb
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2012-06-27 14:15:09 +0100
committerSeb Bacon <seb.bacon@gmail.com>2012-06-27 14:15:09 +0100
commitaf24b1e306dab3ebe10d97f7777abedd011321da (patch)
treeb440b839bf1e7465ab154cdc19ee9366b9f98198 /app/controllers/user_controller.rb
parent6c4c822ef7a4491bf821326af779e5be9118c0a1 (diff)
parent5b80d1b9a0933b1e20de013d1aa8b8522f2ad066 (diff)
Merge branch 'release/0.6.1'0.6.1
Diffstat (limited to 'app/controllers/user_controller.rb')
-rw-r--r--app/controllers/user_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index e56c4dd33..0a9e1d781 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -245,6 +245,7 @@ class UserController < ApplicationController
session[:user_id] = nil
session[:user_circumstance] = nil
session[:remember_me] = false
+ session[:using_admin] = nil
end
def signout
self._do_signout