Merge branch 'master' into sns

Conflicts:
	bbs/register_form_update.php
	config.php
	extend/.htaccess
	plugin/kcp/kcpcert.head.skin.php
	skin/board/basic/view_comment.skin.php
This commit is contained in:
gnuboard
2013-05-21 16:06:07 +09:00
121 changed files with 1707 additions and 1874 deletions

View File

@ -81,7 +81,7 @@ if ($w == 'c') // 댓글 입력
where wr_id = '$comment_id' ";
$reply_array = sql_fetch($sql);
if (!$reply_array['wr_id'])
alert('답변할 댓글 없습니다.\\n\\n답변하는 동안 댓글 삭제되었을 수 있습니다.');
alert('답변할 댓글 없습니다.\\n\\n답변하는 동안 댓글 삭제되었을 수 있습니다.');
$tmp_comment = $reply_array['wr_comment'];