| @@ -71,7 +71,7 class ApplicationController < ActionController::Base | |||||
| 71 | user = User.try_to_autologin(cookies[:autologin]) |
|
71 | user = User.try_to_autologin(cookies[:autologin]) | |
| 72 | session[:user_id] = user.id if user |
|
72 | session[:user_id] = user.id if user | |
| 73 | user |
|
73 | user | |
| 74 | elsif params[:format] == 'atom' && params[:key] && accept_key_auth_actions.include?(params[:action]) |
|
74 | elsif params[:format] == 'atom' && request.get? && params[:key] && accept_key_auth_actions.include?(params[:action]) | |
| 75 | # RSS key authentication does not start a session |
|
75 | # RSS key authentication does not start a session | |
| 76 | User.find_by_rss_key(params[:key]) |
|
76 | User.find_by_rss_key(params[:key]) | |
| 77 | elsif Setting.rest_api_enabled? && api_request? |
|
77 | elsif Setting.rest_api_enabled? && api_request? | |
General Comments 0
You need to be logged in to leave comments.
Login now