diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-19 16:06:38 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-19 16:06:38 -0700 |
| commit | 19260b63080435af8362de3a98e10769f6c5267c (patch) | |
| tree | 980d33c1b2b6195cab12977a22b5b1bbb1e19005 /app/controllers/admin_controller.rb | |
| parent | 12ed72c5ee9597cf771e22af5c090e48e7c0a1e5 (diff) | |
| parent | f8ee42cf1e01d3f89ff8ee324ea423b6239ca2a3 (diff) | |
Merge branch 'release/0.8' into develop
Conflicts:
locale/he_IL/app.po
locale/id/app.po
Diffstat (limited to 'app/controllers/admin_controller.rb')
| -rw-r--r-- | app/controllers/admin_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index d93e68dab..e90f03187 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -79,7 +79,7 @@ class AdminController < ApplicationController return else if session[:using_admin].nil? || session[:admin_name].nil? - if params[:emergency].nil? + if params[:emergency].nil? || Configuration::disable_emergency_user if authenticated?( :web => _("To log into the administrative interface"), :email => _("Then you can log into the administrative interface"), @@ -89,7 +89,6 @@ class AdminController < ApplicationController session[:using_admin] = 1 session[:admin_name] = @user.url_name else - session[:using_admin] = nil session[:user_id] = nil session[:admin_name] = nil |