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
2014-03-18 17:17:47 +09:00
parent eadd50db4b 58dec25bbb
commit f473619449
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bbs/write_update.php
View File

@ -580,7 +580,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(stripslashes($wr_content), $tmp_html);
$wr_content = conv_content(conv_unescape_nl($wr_content), $tmp_html);
$warr = array( ''=>'입력', 'u'=>'수정', 'r'=>'답변', 'c'=>'코멘트', 'cu'=>'코멘트 수정' );
$str = $warr[$w];

4
bbs/write_update_mail.php
View File

@ -19,9 +19,9 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<span style="display:block;padding:10px 30px 30px;background:#f7f7f7;text-align:right">
작성자 <?php echo $wr_name ?>
</span>
<p style="margin:20px 0 0;padding:30px 30px 50px;min-height:200px;height:auto !important;height:200px;border-bottom:1px solid #eee">
<div style="margin:20px 0 0;padding:30px 30px 50px;min-height:200px;height:auto !important;height:200px;border-bottom:1px solid #eee">
<?php echo $wr_content ?>
</p>
</div>
<a href="<?php echo $link_url ?>" style="display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center">사이트에서 게시물 확인하기</a>
</div>
</div>