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

Merge branch 'develop' into pr/new-config-format

Browse source 
Conflicts:
	classes/context/Context.class.php
This commit is contained in:
Kijin Sung 2016-02-05 19:37:10 +09:00
commit 5afefc063c
42 changed files with 435 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/member/member.controller.php
View file

@ -1885,6 +1885,7 @@ class memberController extends member
$this->addMemberMenu( 'dispMemberScrappedDocument', 'cmd_view_scrapped_document');
$this->addMemberMenu( 'dispMemberSavedDocument', 'cmd_view_saved_document');
$this->addMemberMenu( 'dispMemberOwnDocument', 'cmd_view_own_document');
$this->addMemberMenu( 'dispMemberModifyNicknameLog', 'cmd_modify_nickname_log');
}
/**
@ -2273,6 +2274,18 @@ class memberController extends member
$oDB->rollback();
return $output;
}
else
{
if($args->nick_name != $orgMemberInfo->nick_name && $config->update_nick_log == 'Y')
{
$log_args = new stdClass();
$log_args->member_srl = $args->member_srl;
$log_args->before_nick_name = $orgMemberInfo->nick_name;
$log_args->after_nick_name = $args->nick_name;
$log_args->user_id = $args->user_id;
$log_output = executeQuery('member.insertMemberModifyNickName', $log_args);
}
}
if($args->group_srl_list)
{
@ -2397,6 +2410,7 @@ class memberController extends member
$oDB->rollback();
return $output;
}
executeQuery('member.deleteMemberModifyNickNameLog', $args);
// TODO: If the table is not an upgrade may fail.
/*