summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2007-08-30 16:33:50 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2007-08-30 16:33:50 +0000
commit1187ad96ac4922ddd61d4292453a9bec9614abdd (patch)
treeaafb40d927b97038c2e32ef748ffa03e9b009833
parent840f18b1c7e462ee56307eb281a91bb7cbbe3ea4 (diff)
downloadredmine-1187ad96ac4922ddd61d4292453a9bec9614abdd.tar.gz
redmine-1187ad96ac4922ddd61d4292453a9bec9614abdd.zip
Fixed: autologin broken.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@683 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/controllers/application.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index cac2d6464..1bb2eac07 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -37,7 +37,7 @@ class ApplicationController < ActionController::Base
User.current = User.find(session[:user_id])
elsif cookies[:autologin] && Setting.autologin?
# auto-login feature
- User.current = User.find_by_autologin_key(autologin_key)
+ User.current = User.find_by_autologin_key(cookies[:autologin])
elsif params[:key] && accept_key_auth_actions.include?(params[:action])
# RSS key authentication
User.current = User.find_by_rss_key(params[:key])