From e5295c98506685dd0c7634f506328d24c9de0758 Mon Sep 17 00:00:00 2001 From: YJSoft Date: Sun, 19 Jul 2015 09:32:11 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=A7=A7=EC=9D=80=20=EC=A3=BC=EC=86=8C=20?= =?UTF-8?q?=EB=AF=B8=EC=82=AC=EC=9A=A9=EC=8B=9C=20=ED=9A=8C=EC=9B=90=20?= =?UTF-8?q?=EA=B0=80=EC=9E=85=ED=9B=84=20=EC=9D=B4=EB=8F=99=ED=95=A0=20?= =?UTF-8?q?=EC=A3=BC=EC=86=8C=EA=B0=80=20=EC=9E=98=EB=AA=BB=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 짧은 주소 미사용시에도 회원가입후 이동할 주소는 항상 짧은 주소 형태로 생성되는데, 이것을 설정에 따라 긴 주소로도 사용할 수 있게 변경하였습니다. --- modules/member/member.admin.controller.php | 3 ++- modules/member/member.admin.view.php | 10 +++++++++- modules/member/member.model.php | 5 +++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php index 1ef07603a..4810e1c13 100644 --- a/modules/member/member.admin.controller.php +++ b/modules/member/member.admin.controller.php @@ -237,7 +237,8 @@ class memberAdminController extends member 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'; diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php index f6a59dadb..49c96d4f9 100644 --- a/modules/member/member.admin.view.php +++ b/modules/member/member.admin.view.php @@ -141,7 +141,14 @@ class memberAdminView extends member if($config->redirect_url) { - $mid = str_ireplace(Context::getDefaultUrl(), '', $config->redirect_url); + if(!$config->redirect_mid) + { + $mid = str_ireplace(Context::getDefaultUrl(), '', $config->redirect_url); + } + else + { + $mid = $config->redirect_mid; + } $siteModuleInfo = Context::get('site_module_info'); @@ -149,6 +156,7 @@ class memberAdminView extends member $moduleInfo = $oModuleModel->getModuleInfoByMid($mid, (int)$siteModuleInfo->site_srl); $config->redirect_url = $moduleInfo->module_srl; + Context::set('config', $config); } diff --git a/modules/member/member.model.php b/modules/member/member.model.php index e7c90c264..fcff49f66 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -72,6 +72,11 @@ class memberModel extends member 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->redirect_mid) + { + $config->redirect_url = getNotEncodedFullUrl('','mid',$config->redirect_mid); + } + $member_config = $config; return $config; From 3ea7e0b8893887f28e6c5d9e578eb686c094c5c3 Mon Sep 17 00:00:00 2001 From: YJSoft Date: Wed, 22 Jul 2015 20:10:11 +0900 Subject: [PATCH 2/2] Dummy commit to trigger Travis CI update --- modules/member/member.admin.view.php | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php index 49c96d4f9..04c4c0261 100644 --- a/modules/member/member.admin.view.php +++ b/modules/member/member.admin.view.php @@ -156,7 +156,6 @@ class memberAdminView extends member $moduleInfo = $oModuleModel->getModuleInfoByMid($mid, (int)$siteModuleInfo->site_srl); $config->redirect_url = $moduleInfo->module_srl; - Context::set('config', $config); }