From 3b6e5a692b852a88f55b21a7210f60a6f7cfc24b Mon Sep 17 00:00:00 2001
From: Robin Houston <robin.houston@gmail.com>
Date: Mon, 6 Feb 2012 14:48:12 +0000
Subject: Let admin users use auto-login URLs

Don't change logged-in user from an admin when visiting a auto-login URL.

Closes #306.
---
 app/controllers/user_controller.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'app/controllers/user_controller.rb')

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index f49fc9165..403cb9684 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -182,9 +182,11 @@ class UserController < ApplicationController
             return
         end
 
-        @user = post_redirect.user
-        @user.email_confirmed = true
-        @user.save!
+        if !User.stay_logged_in_on_redirect?(@user)
+            @user = post_redirect.user
+            @user.email_confirmed = true
+            @user.save!
+        end
 
         session[:user_id] = @user.id
         session[:user_circumstance] = post_redirect.circumstance
-- 
cgit v1.2.3