From 7f2c857505dea44270602e486b588523a8c51d92 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 9 Dec 2008 03:50:31 +0000
Subject: [PATCH] =?UTF-8?q?issueTracker=EC=9D=98=20=EC=AA=BD=EC=A7=80=20?=
 =?UTF-8?q?=EB=B0=9C=EC=86=A1=20=EC=98=A4=EB=A5=98=20=EB=95=8C=EB=AC=B8?=
 =?UTF-8?q?=EC=97=90=20=ED=9E=88=EC=8A=A4=ED=86=A0=EB=A6=AC=EA=B0=80=20?=
 =?UTF-8?q?=EC=A0=80=EC=9E=A5=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8D=98=20?=
 =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5050 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 common/js/common.js                           |  4 ++--
 .../issuetracker/issuetracker.controller.php  | 22 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

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<br /><br />from : <a href="%s" onclick="window.open(this.href);return false;">%s</a>', 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<br /><br />from : <a href="%s" onclick="window.open(this.href);return false;">%s</a>', 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;