fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-22 05:15:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix infinite attempt to migrate member agreement format

Browse source
This commit is contained in:
Kijin Sung 2017-09-11 15:31:44 +09:00
parent e9daae400e
commit 363f2feeac
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/member/member.class.php
View file

@ -214,7 +214,10 @@ class member extends ModuleObject {
if(!$config->signupForm) return true; if(!$config->signupForm) return true;
// check agreement field exist // check agreement field exist
if($config->agreement) return true; if($config->agreement && $config->agreement !== memberModel::_getAgreement())
{
return true;
}
if($config->skin) if($config->skin)
{ {
@ -330,11 +333,10 @@ class member extends ModuleObject {
$oModuleController = getController('module'); $oModuleController = getController('module');
// check agreement value exist // check agreement value exist
if($config->agreement) if($config->agreement && $config->agreement !== memberModel::_getAgreement())
{ {
$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt'; $agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt';
$output = FileHandler::writeFile($agreement_file, $config->agreement); $output = FileHandler::writeFile($agreement_file, $config->agreement);
$config->agreement = NULL; $config->agreement = NULL;
$output = $oModuleController->updateModuleConfig('member', $config); $output = $oModuleController->updateModuleConfig('member', $config);
} }
@ -344,10 +346,8 @@ class member extends ModuleObject {
if(!$config->signupForm || !is_array($config->signupForm)) if(!$config->signupForm || !is_array($config->signupForm))
{ {
$identifier = 'user_id'; $identifier = 'user_id';
$config->signupForm = $oMemberAdminController->createSignupForm($identifier); $config->signupForm = $oMemberAdminController->createSignupForm($identifier);
$config->identifier = $identifier; $config->identifier = $identifier;
unset($config->agreement);
$output = $oModuleController->updateModuleConfig('member', $config); $output = $oModuleController->updateModuleConfig('member', $config);
} }