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

Merge branch 'develop' of github.com:xpressengine/xe-core into develop

Browse source
This commit is contained in:
bnu 2015-03-06 14:24:31 +09:00
commit c473c345bb
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1184,6 +1184,8 @@ class memberController extends member
$auth_args->member_srl = $member_srl;
$auth_args->auth_key = $oPassword->createSecureSalt(40);
$oDB = &DB::getInstance();
$oDB->begin();
$output = executeQuery('member.updateAuthMail', $auth_args);
if(!$output->toBool())
{
@ -2456,6 +2458,8 @@ class memberController extends member
$auth_args->auth_key = $oPassword->createSecureSalt(40);
$auth_args->new_password = 'XE_change_emaill_address';
$oDB = &DB::getInstance();
$oDB->begin();
$output = executeQuery('member.insertAuthMail', $auth_args);
if(!$output->toBool())
{