diff --git a/common/js/common.js b/common/js/common.js index b2a570e1b..4f7c3e27a 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -88,7 +88,7 @@ String.prototype.setQuery = function(key, val) { for(var i in args) { if( !args.hasOwnProperty(i) ) continue; var arg = args[i]; - if(!arg.toString().trim()) continue; + if(!arg || !arg.toString().trim()) continue; q_list[q_list.length] = i+'='+arg; } @@ -971,4 +971,4 @@ function xSleep(sec) { while( sleep.getTime() - now.getTime() < sec) { sleep = new Date(); } -} \ No newline at end of file +} diff --git a/modules/issuetracker/issuetracker.controller.php b/modules/issuetracker/issuetracker.controller.php index 2773b4e83..c2e083ba0 100644 --- a/modules/issuetracker/issuetracker.controller.php +++ b/modules/issuetracker/issuetracker.controller.php @@ -305,18 +305,18 @@ if($change_args!==null) { // 이슈 상태 변경시 보고자에게 쪽지 발송 if($oIssue->get('member_srl') && $oIssue->useNotify()) { - // 현재 로그인한 사용자와 글을 쓴 사용자를 비교하여 동일하면 return - if($logged_info->member_srl == $oIssue->get('member_srl')) return; + // 현재 로그인한 사용자와 글을 쓴 사용자를 비교하여 동일하지 않으면 진행 + if($logged_info->member_srl != $oIssue->get('member_srl')) { + // 변수 정리 + $title = '['.Context::getLang('cmd_resolve_as').'-'.$status_lang[$change_args->status].'] '.$oIssue->getTitleText(); + $content = sprintf('%s

from : %s', nl2br($args->content), $oIssue->getPermanentUrl(), $oIssue->getPermanentUrl()); + $receiver_srl = $oIssue->get('member_srl'); + $sender_member_srl = $logged_info->member_srl; - // 변수 정리 - $title = '['.Context::getLang('cmd_resolve_as').'-'.$status_lang[$change_args->status].'] '.$oIssue->getTitleText(); - $content = sprintf('%s

from : %s', nl2br($args->content), $oIssue->getPermanentUrl(), $oIssue->getPermanentUrl()); - $receiver_srl = $oIssue->get('member_srl'); - $sender_member_srl = $logged_info->member_srl; - - // 쪽지 발송 - $oCommunicationController = &getController('communication'); - $oCommunicationController->sendMessage($sender_member_srl, $receiver_srl, $title, $content, false); + // 쪽지 발송 + $oCommunicationController = &getController('communication'); + $oCommunicationController->sendMessage($sender_member_srl, $receiver_srl, $title, $content, false); + } } $change_args->target_srl = $target_srl;