|
|
@ -207,9 +207,6 @@ class ApplicationController < ActionController::Base
|
|
|
|
elsif session[:wechat_openid]
|
|
|
|
elsif session[:wechat_openid]
|
|
|
|
uw = UserWechat.find_by_openid(session[:wechat_openid])
|
|
|
|
uw = UserWechat.find_by_openid(session[:wechat_openid])
|
|
|
|
user = uw.user if uw
|
|
|
|
user = uw.user if uw
|
|
|
|
elsif session[:third_party_user_id]
|
|
|
|
|
|
|
|
c_user = UserSource.find_by_id(session[:third_party_user_id])
|
|
|
|
|
|
|
|
user = c_user.user if c_user
|
|
|
|
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
if user.nil? && Setting.rest_api_enabled? && accept_api_auth?
|
|
|
|
if user.nil? && Setting.rest_api_enabled? && accept_api_auth?
|
|
|
|