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

reverse merge from 1.6.0 (r10051)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10698 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-16 09:46:12 +00:00
parent 5b58ed4481
commit c6c3fdcf12
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1842,7 +1842,7 @@
unset($args->denied);
}
// check mamber identifier form
// check member identifier form
$config = $oMemberModel->getMemberConfig();
$output = executeQuery('member.getMemberInfoByMemberSrl', $args);
@ -1855,7 +1855,7 @@
$args->email_address = $orgMemberInfo->email_address;
}else{
$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
if($member_srl&&$args->member_srl!=$member_srl) return new Object(-1,'msg_exists_email_address');
if($member_srl&&$args->member_srl!=$member_srl) return new Object(-1,'msg_exists_user_id');
$args->user_id = $orgMemberInfo->user_id;
}