firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'g5'

Browse Source
This commit is contained in:
chicpro
2016-01-06 09:06:00 +09:00
parent ce62cf294e 5111f026e6
commit 2cdfe45774
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bbs/qawrite_update.php
View File

@ -403,7 +403,7 @@ if($w == 'a' && $write['qa_email_recv'] && trim($write['qa_email'])) {
include_once(G5_LIB_PATH.'/mailer.lib.php');
$subject = $config['cf_title'].' '.$qaconfig['qa_title'].' 답변 알림 메일';
$content = nl2br(conv_unescape_nl($qa_content));
$content = nl2br(conv_unescape_nl(stripslashes($qa_content)));
mailer($config['cf_admin_email_name'], $config['cf_admin_email'], $write['qa_email'], $subject, $content, 1);
}
@ -413,7 +413,7 @@ if(($w == '' || $w == 'r') && trim($qaconfig['qa_admin_email'])) {
include_once(G5_LIB_PATH.'/mailer.lib.php');
$subject = $config['cf_title'].' '.$qaconfig['qa_title'].' 질문 알림 메일';
$content = nl2br(conv_unescape_nl($qa_content));
$content = nl2br(conv_unescape_nl(stripslashes($qa_content)));
mailer($config['cf_admin_email_name'], $qa_email, $qaconfig['qa_admin_email'], $subject, $content, 1);
}

2
bbs/write_update.php
View File

@ -607,7 +607,7 @@ if (!($w == 'u' || $w == 'cu') && $config['cf_email_use'] && $board['bo_use_emai
else if (strstr($html, 'html2'))
$tmp_html = 2;
$wr_content = conv_content(conv_unescape_nl($wr_content), $tmp_html);
$wr_content = conv_content(conv_unescape_nl(stripslashes($wr_content)), $tmp_html);
$warr = array( ''=>'입력', 'u'=>'수정', 'r'=>'답변', 'c'=>'코멘트', 'cu'=>'코멘트 수정' );
$str = $warr[$w];