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

issue 1095, 1080 fixed

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10150 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-02-21 05:09:28 +00:00
parent 2bd25445f8
commit c5f179cbb2
4 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -490,7 +490,7 @@
$getVars = array();
if ($config->signupForm){
foreach($config->signupForm as $formInfo){
if($formInfo->isDefaultForm && $formInfo->isUse && ($formInfo->required || $formInfo->mustRequired)){
if($formInfo->isDefaultForm && ($formInfo->isUse || $formInfo->required || $formInfo->mustRequired)){
$getVars[] = $formInfo->name;
}
}
@ -558,7 +558,17 @@
}
// Log-in
if ($config->enable_confirm != 'Y') $this->doLogin($args->user_id);
if ($config->enable_confirm != 'Y')
{
if($config->identifier == 'email_address')
{
$this->doLogin($args->email_address);
}
else
{
$this->doLogin($args->user_id);
}
}
// Results
$this->add('member_srl', $args->member_srl);
@ -580,10 +590,18 @@
}
else
{
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
if(Context::get('success_return_url'))
{
$returnUrl = Context::get('success_return_url');
}
else if($_COOKIE['XE_REDIRECT_URL'])
{
$returnUrl = $_COOKIE['XE_REDIRECT_URL'];
setcookie("XE_REDIRECT_URL", '', 1);
}
}
$this->setRedirectUrl = $returnUrl;
header('location:' . $returnUrl);
return;
}
}