merge from 1.5.2.1

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10466 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-03-23 05:49:16 +00:00
parent c727926d9e
commit 9bf08cf3df
26 changed files with 110 additions and 97 deletions

View file

@ -1689,11 +1689,6 @@
if (!$args->user_id) $args->user_id = 't'.$args->member_srl;
if (!$args->user_name) $args->user_name = $args->member_srl;
if(trim($args->find_account_answer))
{
$args->find_account_answer = md5($args->find_account_answer);
}
$output = executeQuery('member.insertMember', $args);
if(!$output->toBool()) {
$oDB->rollback();