From 520ed9204c55c8b3b0a27348de5d432fe594ad57 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 6 Feb 2014 13:38:07 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B0=80=EC=9E=85=EB=A9=94=EC=9D=BC=20?=
 =?UTF-8?q?=EC=9D=B8=EC=A6=9D=EB=A9=94=EC=9D=BC=20=EB=8F=99=EC=8B=9C=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=20=EB=95=8C=20=EA=B0=80=EC=9E=85=EB=A9=94?=
 =?UTF-8?q?=EC=9D=BC=EB=A7=8C=20=EB=B0=9C=EC=86=A1=EB=90=98=EB=8F=84?=
 =?UTF-8?q?=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

---
 bbs/register_form_update.php       | 4 ++++
 bbs/register_form_update_mail3.php | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php
index 960d5a138..31bda65a0 100644
--- a/bbs/register_form_update.php
+++ b/bbs/register_form_update.php
@@ -252,6 +252,10 @@ if ($w == '') {
         ob_end_clean();
 
         mailer($config['cf_title'], $config['cf_admin_email'], $mb_email, $subject, $content, 1);
+
+        // 메일인증을 사용하는 경우 가입메일에 인증 url이 있으므로 인증메일을 다시 발송되지 않도록 함
+        if($config['cf_use_email_certify'])
+            $old_email = $mb_email;
     }
 
     // 최고관리자님께 메일 발송
diff --git a/bbs/register_form_update_mail3.php b/bbs/register_form_update_mail3.php
index 36f975330..5ae4d46a9 100644
--- a/bbs/register_form_update_mail3.php
+++ b/bbs/register_form_update_mail3.php
@@ -21,7 +21,9 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
             <a href="<?php echo G5_URL ?>" target="_blank"><?php echo $config['cf_title'] ?></a>
         </span>
         <p style="margin:20px 0 0;padding:30px 30px 50px;min-height:200px;height:auto !important;height:200px;border-bottom:1px solid #eee">
+            <?php if($w == 'u') { ?>
             <b><?php echo $mb_name ?></b> 님의 E-mail 주소가 변경되었습니다.<br><br>
+            <?php } ?>
 
             아래의 주소를 클릭하시면 인증이 완료됩니다.<br>
             <a href="<?php echo $certify_href ?>" target="_blank"><b><?php echo $certify_href ?></b></a><br><br>