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

Merge #1657 짧은 주소 미사용시 회원 가입후 이동할 주소가 잘못 생성되는 문제 수정 by YJSoft

Browse source 
* pr/1657:
  Dummy commit to trigger Travis CI update
  짧은 주소 미사용시 회원 가입후 이동할 주소가 잘못 생성되는 문제 수정
This commit is contained in:
Kijin Sung 2015-10-08 15:07:13 +09:00
commit e04e8cb248
3 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/member/member.admin.controller.php
View file

@ -240,7 +240,8 @@ class memberAdminController extends member
return new Object('-1', 'msg_exist_selected_module'); return new Object('-1', 'msg_exist_selected_module');
} }
$args->redirect_url = Context::getDefaultUrl().$redirectModuleInfo->mid; $args->redirect_mid = $redirectModuleInfo->mid;
$args->redirect_url = getNotEncodedFullUrl('','mid',$redirectModuleInfo->mid);
} }
$args->profile_image = $args->profile_image ? 'Y' : 'N'; $args->profile_image = $args->profile_image ? 'Y' : 'N';

7
modules/member/member.admin.view.php
View file

@ -140,8 +140,15 @@ class memberAdminView extends member
$config = $this->memberConfig; $config = $this->memberConfig;
if($config->redirect_url) if($config->redirect_url)
{
if(!$config->redirect_mid)
{ {
$mid = str_ireplace(Context::getDefaultUrl(), '', $config->redirect_url); $mid = str_ireplace(Context::getDefaultUrl(), '', $config->redirect_url);
}
else
{
$mid = $config->redirect_mid;
}
$siteModuleInfo = Context::get('site_module_info'); $siteModuleInfo = Context::get('site_module_info');

5
modules/member/member.model.php
View file

@ -74,6 +74,11 @@ class memberModel extends member
if(!$config->signature_editor_skin || $config->signature_editor_skin == 'default') $config->signature_editor_skin = 'ckeditor'; if(!$config->signature_editor_skin || $config->signature_editor_skin == 'default') $config->signature_editor_skin = 'ckeditor';
if(!$config->sel_editor_colorset) $config->sel_editor_colorset = 'moono'; if(!$config->sel_editor_colorset) $config->sel_editor_colorset = 'moono';
if($config->redirect_mid)
{
$config->redirect_url = getNotEncodedFullUrl('','mid',$config->redirect_mid);
}
$member_config = $config; $member_config = $config;
return $config; return $config;