From 4b892ffade811d31c4f990ae1c4ccbb6eee5da78 Mon Sep 17 00:00:00 2001 From: "Jin Hu, Baek" Date: Tue, 22 Apr 2014 17:43:50 +0900 Subject: [PATCH 01/12] =?UTF-8?q?getNewestCommentList=20=EB=A9=94=EC=86=8C?= =?UTF-8?q?=EB=93=9C=EC=97=90=EC=84=9C=20document=5Fsrl=EC=A7=80=EC=A0=95?= =?UTF-8?q?=ED=86=A0=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/comment/comment.model.php | 1 + modules/comment/queries/getNewestCommentList.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php index 3dbb57a1a..93e26a7d1 100644 --- a/modules/comment/comment.model.php +++ b/modules/comment/comment.model.php @@ -385,6 +385,7 @@ class commentModel extends comment $args->module_srl = $obj->module_srl; } + $args->document_srl = $obj->document_srl; $args->list_count = $obj->list_count; if(strpos($args->module_srl, ",") === false) diff --git a/modules/comment/queries/getNewestCommentList.xml b/modules/comment/queries/getNewestCommentList.xml index c9829afc1..6c50ce5e2 100644 --- a/modules/comment/queries/getNewestCommentList.xml +++ b/modules/comment/queries/getNewestCommentList.xml @@ -8,6 +8,7 @@ + From f9c505497667db98ecd0f48f19aae427d1ff1c42 Mon Sep 17 00:00:00 2001 From: "Jin Hu, Baek" Date: Thu, 8 May 2014 01:54:45 +0900 Subject: [PATCH 02/12] =?UTF-8?q?document=5Fsrl=20=EB=AF=B8=EC=A7=80?= =?UTF-8?q?=EC=A0=95=EC=8B=9C=20=EB=8D=A7=EA=B8=80=20=EB=B6=88=EB=9F=AC?= =?UTF-8?q?=EC=98=A4=EC=A7=80=20=EB=AA=BB=ED=95=98=EB=8A=94=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/comment/queries/getNewestCommentList.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/comment/queries/getNewestCommentList.xml b/modules/comment/queries/getNewestCommentList.xml index 6c50ce5e2..67bb42265 100644 --- a/modules/comment/queries/getNewestCommentList.xml +++ b/modules/comment/queries/getNewestCommentList.xml @@ -8,7 +8,7 @@ - + From 9d54a8d6536eec4ac0b5a1e6209a379c815db785 Mon Sep 17 00:00:00 2001 From: "Jin Hu, Baek" Date: Thu, 8 May 2014 02:31:04 +0900 Subject: [PATCH 03/12] Update getNewestCommentList.xml --- modules/comment/queries/getNewestCommentList.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/comment/queries/getNewestCommentList.xml b/modules/comment/queries/getNewestCommentList.xml index 67bb42265..a8cdd39c1 100644 --- a/modules/comment/queries/getNewestCommentList.xml +++ b/modules/comment/queries/getNewestCommentList.xml @@ -8,7 +8,7 @@ - + From 393675942f8929e59e0a7211008edeaa91c7ce94 Mon Sep 17 00:00:00 2001 From: ngleader Date: Sun, 11 May 2014 22:10:22 +0900 Subject: [PATCH 04/12] NOISSUE, rearrange some code in index.php --- index.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index cb6c2103a..1b9780e8b 100644 --- a/index.php +++ b/index.php @@ -45,7 +45,7 @@ require dirname(__FILE__) . '/config/config.inc.php'; * @brief Initialize by creating Context object * Set all Request Argument/Environment variables **/ -$oContext = &Context::getInstance(); +$oContext = Context::getInstance(); $oContext->init(); /** @@ -59,8 +59,7 @@ if($oContext->checkSSO()) { if($oModuleHandler->init()) { - $oModule = &$oModuleHandler->procModule(); - $oModuleHandler->displayContent($oModule); + $oModuleHandler->displayContent($oModuleHandler->procModule()); } } catch(Exception $e) From b7d95487ea6a72218f233851fb86b011ca7651f2 Mon Sep 17 00:00:00 2001 From: akasima Date: Mon, 12 May 2014 16:13:38 +0900 Subject: [PATCH 05/12] =?UTF-8?q?#660=20=ED=9A=8C=EC=9B=90=20=ED=83=88?= =?UTF-8?q?=ED=87=B4=20=EC=B2=98=EB=A6=AC=20=EC=8B=9C=20=EC=AA=BD=EC=A7=80?= =?UTF-8?q?=20=EB=82=B4=EC=9A=A9=20=EC=9E=85=EB=A0=A5=EB=9E=80=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/member/tpl/member_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html index dc8b5b45b..0e6e802e2 100644 --- a/modules/member/tpl/member_list.html +++ b/modules/member/tpl/member_list.html @@ -154,7 +154,7 @@

{$lang->member_group}

-
+ From 50465586a721ec8c72d683b0a8d7ff3b5910b8f5 Mon Sep 17 00:00:00 2001 From: akasima Date: Mon, 12 May 2014 16:41:14 +0900 Subject: [PATCH 06/12] =?UTF-8?q?#589=20=ED=9A=8C=EC=9B=90=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=20=EC=9D=BC=EA=B4=84=20=EB=B3=80=EA=B2=BD=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/member/member.admin.controller.php | 2 +- modules/member/tpl/member_list.html | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php index 4b39da224..d8e03ae49 100644 --- a/modules/member/member.admin.controller.php +++ b/modules/member/member.admin.controller.php @@ -831,7 +831,6 @@ class memberAdminController extends member { $args->denied = $var->denied; $output = executeQuery('member.updateMemberDeniedInfo', $args); - $this->_clearMemberCache($args->member_srl); if(!$output->toBool()) { $oDB->rollback(); @@ -853,6 +852,7 @@ class memberAdminController extends member $this->setMessage('success_deleted'); } } + $oMemberController->_clearMemberCache($args->member_srl); } $message = $var->message; diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html index 0e6e802e2..0806e5735 100644 --- a/modules/member/tpl/member_list.html +++ b/modules/member/tpl/member_list.html @@ -154,6 +154,11 @@

{$lang->member_group}

+