diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-19 18:56:20 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-19 18:56:20 -0700 |
| commit | 56127c664a4f51e18728ed08bdf00064efee89c2 (patch) | |
| tree | cd04bdcc929ea4232d44d02f51192f6459928769 /app/controllers/admin_controller.rb | |
| parent | f7878a229b597b5fc7ba8172c8e8c94a8fd9d7b6 (diff) | |
| parent | dc71db3f98c64fb93ac7d74b8a424f7849a33786 (diff) | |
Merge branch 'develop' into rails-3-develop
Conflicts:
Gemfile
Gemfile.lock
app/views/admin_request/show.html.erb
config/environment.rb
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 5a8b1fe55..7eb00a761 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 |