diff --git a/bbs/move_update.php b/bbs/move_update.php index a6baf8c9e..06293918d 100644 --- a/bbs/move_update.php +++ b/bbs/move_update.php @@ -42,8 +42,17 @@ while ($row = sql_fetch_array($result)) while ($row2 = sql_fetch_array($result2)) { $nick = cut_str($member['mb_nick'], $config['cf_cut_name']); - if (!$row2['wr_is_comment'] && $config['cf_use_copy_log']) - $row2['wr_content'] .= "\n".'
[이 게시물은 '.$nick.'님에 의해 '.G5_TIME_YMDHIS.' '.$board['bo_subject'].'에서 '.($sw == 'copy' ? '복사' : '이동').' 됨]
'; + if (!$row2['wr_is_comment'] && $config['cf_use_copy_log']) { + if(strstr($row2['wr_option'], 'html')) { + $log_tag1 = '
'; + $log_tag2 = '
'; + } else { + $log_tag1 = "\n"; + $log_tag2 = ''; + } + + $row2['wr_content'] .= "\n".$log_tag1.'[이 게시물은 '.$nick.'님에 의해 '.G5_TIME_YMDHIS.' '.$board['bo_subject'].'에서 '.($sw == 'copy' ? '복사' : '이동').' 됨]'.$log_tag2; + } $sql = " insert into $move_write_table set wr_num = '$next_wr_num', diff --git a/head.sub.php b/head.sub.php index 7609d275b..2b6b47d24 100644 --- a/head.sub.php +++ b/head.sub.php @@ -37,6 +37,9 @@ if (G5_IS_MOBILE) { echo ''.PHP_EOL; echo ''.PHP_EOL; echo ''.PHP_EOL; +} else { + echo ''.PHP_EOL; + echo ''.PHP_EOL; } ?> <?php echo $g5_head_title; ?> @@ -44,16 +47,13 @@ if (G5_IS_MOBILE) { if (defined('G5_IS_ADMIN')) { echo ''.PHP_EOL; } else { + echo ''.PHP_EOL; // canonical 지정 $canonical = ''; - if ($bo_table && $wr_id) $canonical = 'http://'.$_SERVER["HTTP_HOST"].'/bbs/board.php?bo_table='.$bo_table.'&wr_id='.$wr_id; - else $canonical = 'http://'.$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"]; - echo ''; - - echo ''.PHP_EOL; + if ($bo_table && $wr_id) $canonical = 'http://'.$_SERVER['HTTP_HOST'].'/bbs/board.php?bo_table='.$bo_table.'&wr_id='.$wr_id; + else $canonical = 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']; + echo ''.PHP_EOL; } -echo ''; -echo ''; ?>