|
|
|
@ -314,7 +314,7 @@ class AccountController < ApplicationController
|
|
|
|
|
#根据home_url生产正则表达式
|
|
|
|
|
eval("code = " + "/^" + home_url.gsub(/\//,"\\\/") + "\\\/*(welcome)?\\\/*(\\\/index\\\/*.*)?\$/")
|
|
|
|
|
if (code=~params[:back_url] || params[:back_url].to_s.include?('lost_password')) && last_login_on != ''
|
|
|
|
|
redirect_to user_activities_path(user)
|
|
|
|
|
redirect_to user_activities_path(user,host: Setting.user_domain)
|
|
|
|
|
else
|
|
|
|
|
if last_login_on == ''
|
|
|
|
|
redirect_to my_account_url
|
|
|
|
|