From 0c60ea66e368294c56604af7e0431921d461da0e Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 24 Feb 2019 00:42:34 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9E=90=EA=B5=AD=20=EB=82=B4=20=EC=99=B8?=
 =?UTF-8?q?=EA=B5=90=EA=B6=8C=EC=9E=90=EC=97=90=EA=B2=8C=EB=8A=94=20?=
 =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=EB=B3=B4=EB=82=BC=20=EC=88=98=20?=
 =?UTF-8?q?=EC=9E=88=EB=8F=84=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

---
 hwe/j_msg_submit.php | 2 +-
 hwe/js/msg.js        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hwe/j_msg_submit.php b/hwe/j_msg_submit.php
index 51bd87b9..dbaba7e0 100644
--- a/hwe/j_msg_submit.php
+++ b/hwe/j_msg_submit.php
@@ -161,7 +161,7 @@ if($mailbox > 0) {
     }
 
     $destPermission = checkSecretPermission($destUser, false);
-    if($permission == 4 && $destPermission == 4){
+    if($permission == 4 && $destPermission == 4 && $destUser['nation'] != $me['nation']){
         Json::die([
             'result' => false,
             'reason' => '외교권자끼리는 메시지를 보낼 수 없습니다.',
diff --git a/hwe/js/msg.js b/hwe/js/msg.js
index b812cc49..b70eaf93 100644
--- a/hwe/js/msg.js
+++ b/hwe/js/msg.js
@@ -385,7 +385,7 @@ function refreshMailboxList(obj){
 
             var $item = $('<option value="{0}">{1}</option>'.format(generalID, textName));
 
-            if(permissionLevel == 4 && isAmbassador){
+            if(permissionLevel == 4 && isAmbassador && myNation.mailbox != nation.mailbox){
                 $item.prop('disabled', true);
             }
             $optgroup.append($item);