fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 02:31:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Remove duplicate agreement in member_config #1788

Browse source 
- $config->agreements와 중복되는 $config->agreement는 삭제
- 회원가입폼(dispMemberSignUpForm)에 한하여, 첫 번째 약관의 내용을
  $member_config->agreement에 넣어주어 오래된 스킨과의 호환성을 유지함
This commit is contained in:
Kijin Sung 2021-09-11 00:23:57 +09:00
parent 602d7aec79
commit 891b57c770
3 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/member/member.model.php
View file

@ -60,19 +60,15 @@ class memberModel extends member
$config->features['nickname_log'] = $config->features['nickname_log'] ?? true;
// Set agreements config
if(isset($config->agreements) && is_array($config->agreements))
if(!isset($config->agreements) || !is_array($config->agreements))
{
$config->agreement = $config->agreements[1]->content;
}
else
{
$config->agreement = self::_getAgreement();
$config->agreements = array();
$config->agreements[1] = new stdClass;
$config->agreements[1]->title = lang('agreement');
$config->agreements[1]->content = $config->agreement;
$config->agreements[1]->type = $config->agreement ? 'required' : 'disabled';
$config->agreements[1]->content = self::_getAgreement() ?: ($config->agreement ?? '');
$config->agreements[1]->type = !empty($config->agreements[1]->content) ? 'required' : 'disabled';
}
unset($config->agreement);
// Set signup config
$config->limit_day = $config->limit_day ?? 0;