merge with 1.4.5 branch(1.4.5.10)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@9269 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-09-22 05:29:04 +00:00
parent 92332c8ebb
commit a0d57a320f
98 changed files with 970 additions and 432 deletions

View file

@ -1633,6 +1633,9 @@
// DB에 입력
$args->member_srl = getNextSequence();
$args->list_order = -1 * $args->member_srl;
$args->nick_name = htmlspecialchars($args->nick_name);
$args->homepage = htmlspecialchars($args->homepage);
$args->blog = htmlspecialchars($args->blog);
if($args->password && !$password_is_hashed) $args->password = md5($args->password);
elseif(!$args->password) unset($args->password);
@ -1780,6 +1783,9 @@
if($args->password) $args->password = md5($args->password);
else $args->password = $member_info->password;
if(!$args->user_name) $args->user_name = $member_info->user_name;
$args->nick_name = htmlspecialchars($args->nick_name);
$args->homepage = htmlspecialchars($args->homepage);
$args->blog = htmlspecialchars($args->blog);
if(!$args->description) $args->description = '';
$output = executeQuery('member.updateMember', $args);