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

Merge branch 'pr/1225' into develop

Browse source 
Conflicts:
	modules/member/member.controller.php
This commit is contained in:
jdssem 2015-03-23 14:43:05 +09:00 • committed by bnu
commit 752f30c3f3
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2268,8 +2268,6 @@ class memberController extends member
*/
function updateMemberPassword($args)
{
$output = executeQuery('member.updateChangePasswordDate', $args);
if($args->password)
{
@ -2291,6 +2289,10 @@ class memberController extends member
}
$output = executeQuery('member.updateMemberPassword', $args);
if($output->toBool())
{
$result = executeQuery('member.updateChangePasswordDate', $args);
}
$this->_clearMemberCache($args->member_srl);