Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix #2290 관리자가 회원 메모를 삭제할수 없는 문제 수정 #2292

Merged
1 commit merged into from
Aug 31, 2018
Merged

fix #2290 관리자가 회원 메모를 삭제할수 없는 문제 수정 #2292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions modules/member/member.admin.controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function procMemberAdminInsert()

$args = Context::gets('member_srl','email_address','find_account_answer', 'allow_mailing','allow_message','denied','is_admin','description','group_srl_list','limit_date');
$oMemberModel = &getModel ('member');
$config = $oMemberModel->getMemberConfig ();
$config = $oMemberModel->getMemberConfig();
$getVars = array();
if($config->signupForm)
{
Expand Down Expand Up @@ -60,10 +60,13 @@ function procMemberAdminInsert()
unset($all_args->error_return_url);
unset($all_args->success_return_url);
unset($all_args->ruleset);
if(!isset($args->limit_date)) $args->limit_date = "";
unset($all_args->password);
unset($all_args->password2);
unset($all_args->reset_password);

if(!isset($args->limit_date)) $args->limit_date = "";
if(!isset($args->description)) $args->description = "";

// Add extra vars after excluding necessary information from all the requested arguments
$extra_vars = delObjectVars($all_args, $args);
$args->extra_vars = serialize($extra_vars);
Expand Down Expand Up @@ -166,13 +169,13 @@ public function procMemberAdminInsertDefaultConfig()
'password_hashing_work_factor',
'password_hashing_auto_upgrade'
);

$oPassword = new Password();
if(!array_key_exists($args->password_hashing_algorithm, $oPassword->getSupportedAlgorithms()))
{
$args->password_hashing_algorithm = 'md5';
}

$args->password_hashing_work_factor = intval($args->password_hashing_work_factor, 10);
if($args->password_hashing_work_factor < 4)
{
Expand Down
2 changes: 1 addition & 1 deletion modules/member/member.controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2434,7 +2434,7 @@ function updateMember($args, $is_admin = FALSE)
if(!$args->user_name) $args->user_name = $orgMemberInfo->user_name;
if(!$args->user_id) $args->user_id = $orgMemberInfo->user_id;
if(!$args->nick_name) $args->nick_name = $orgMemberInfo->nick_name;
if(!$args->description) $args->description = $orgMemberInfo->description;
if(!isset($args->description)) $args->description = $orgMemberInfo->description;
if(!$args->birthday) $args->birthday = '';

$output = executeQuery('member.updateMember', $args);
Expand Down