diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-07-02 13:09:06 +0100 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-07-02 13:09:06 +0100 |
| commit | de929cfe8c0f297c9945189f1456bba3908498a1 (patch) | |
| tree | b8ddd5f1875723bda896c66084bc438fe6b8c088 /app/controllers/user_controller.rb | |
| parent | 84a27578e5e82739e3a6826c5d2d9890edd600a4 (diff) | |
| parent | a9f1d84e7810936f7917c8a367b4713ea77554c9 (diff) | |
Merge branch 'master' into wdtk
Diffstat (limited to 'app/controllers/user_controller.rb')
| -rw-r--r-- | app/controllers/user_controller.rb | 1 |
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 |