diff --git a/AvocadoAmber/adm/board_form_update.php b/AvocadoAmber/adm/board_form_update.php index 77dcb0a..efd2bac 100644 --- a/AvocadoAmber/adm/board_form_update.php +++ b/AvocadoAmber/adm/board_form_update.php @@ -266,7 +266,7 @@ $sql_common = " gr_id = '{$_POST['gr_id']}', bo_8 = '{$_POST['bo_8']}', bo_9 = '{$_POST['bo_9']}', bo_10 = '{$_POST['bo_10']}', - bo_version = '". BOARD_MIGRATION_VERSION . "';"; + bo_version = '". BOARD_MIGRATION_VERSION . "'"; if ($w == '') { @@ -320,12 +320,6 @@ if ($w == '') { $sql = "SELECT a.wr_id, (count(b.wr_parent) - 1) AS cnt FROM {$g5['write_prefix']}{$bo_table} a, {$g5['write_prefix']}{$bo_table} b WHERE a.wr_id=b.wr_parent AND a.wr_is_comment=0 GROUP BY a.wr_id "; $result = sql_query($sql); for ($i = 0; $row = sql_fetch_array($result); $i++) { - /* - // 코멘트수를 얻습니다. - $sql2 = "SELECT count(*) as cnt FROM {$g5['write_prefix']}$bo_table where wr_parent = '{$row['wr_id']}' and wr_is_comment = 1 "; - $row2 = sql_fetch($sql2); - */ - sql_query("UPDATE {$g5['write_prefix']}{$bo_table} SET wr_comment = '{$row['cnt']}' where wr_id = '{$row['wr_id']}' "); } } @@ -355,7 +349,6 @@ if ($w == '') { } - // 같은 그룹내 게시판 동일 옵션 적용 $grp_fields = ''; if (is_checked('chk_grp_device')) diff --git a/AvocadoAmber/bbs/write.php b/AvocadoAmber/bbs/write.php index 0433039..20e99e4 100644 --- a/AvocadoAmber/bbs/write.php +++ b/AvocadoAmber/bbs/write.php @@ -21,7 +21,7 @@ if (!($w == '' || $w == 'u' || $w == 'r')) { } if ($w == 'u' || $w == 'r') { - if ($write['wr_id']) { + if ($write['wr_id'] || $wr_parent == -1) { // 가변 변수로 $wr_1 .. $wr_10 까지 만든다. for ($i = 1; $i <= 10; $i++) { $vvar = "wr_" . $i; diff --git a/AvocadoAmber/bbs/write_comment_update.php b/AvocadoAmber/bbs/write_comment_update.php index a20732c..48f398a 100644 --- a/AvocadoAmber/bbs/write_comment_update.php +++ b/AvocadoAmber/bbs/write_comment_update.php @@ -45,7 +45,7 @@ if ($w == 'c' && $_SESSION['ss_datetime'] >= (G5_SERVER_TIME - $config['cf_delay set_session('ss_datetime', G5_SERVER_TIME); $wr = get_write($write_table, $wr_id); -if (empty($wr['wr_id'])) +if (empty($wr['wr_id']) && $wr_id != -1) alert("글이 존재하지 않습니다.\\n글이 삭제되었거나 이동하였을 수 있습니다."); diff --git a/AvocadoAmber/bbs/write_update_file.php b/AvocadoAmber/bbs/write_update_file.php index 434a580..f889cfe 100644 --- a/AvocadoAmber/bbs/write_update_file.php +++ b/AvocadoAmber/bbs/write_update_file.php @@ -79,7 +79,7 @@ $notice_array = explode(",", $board['bo_notice']); if ($w == 'u' || $w == 'r') { $wr = get_write($write_table, $wr_id); - if (!$wr['wr_id']) { + if (!$wr['wr_id'] && $wr_parent != -1) { alert("글이 존재하지 않습니다.\\n글이 삭제되었거나 이동하였을 수 있습니다."); } } diff --git a/AvocadoAmber/plugin/editor/smarteditor2/photo_uploader/plugin/hp_SE2M_AttachQuickPhoto.js b/AvocadoAmber/plugin/editor/smarteditor2/photo_uploader/plugin/hp_SE2M_AttachQuickPhoto.js index 23835a8..d8c98c2 100644 --- a/AvocadoAmber/plugin/editor/smarteditor2/photo_uploader/plugin/hp_SE2M_AttachQuickPhoto.js +++ b/AvocadoAmber/plugin/editor/smarteditor2/photo_uploader/plugin/hp_SE2M_AttachQuickPhoto.js @@ -95,10 +95,7 @@ nhn.husky.SE2M_AttachQuickPhoto = jindo.$Class({ */ _getPhotoTag: function (htPhotoInfo) { // id와 class는 썸네일과 연관이 많습니다. 수정시 썸네일 영역도 Test - var sTag = ''; - if (htPhotoInfo.bNewLine) { - sTag += '
'; - } + var sTag = '

'; sTag = jindo.$Template(sTag).process(htPhotoInfo); return sTag; diff --git a/AvocadoAmber/skin/member/basic/style.admin.css b/AvocadoAmber/skin/member/basic/style.admin.css index 19a49ec..f643702 100644 --- a/AvocadoAmber/skin/member/basic/style.admin.css +++ b/AvocadoAmber/skin/member/basic/style.admin.css @@ -34,7 +34,7 @@ body { justify-content: start; align-items: center; flex-direction: column; - background: linear-gradient(to top, rgba(0,0,0,1) 0%, var(--theme-gray-900) 50%, var(--theme-gray-900) 100%); + background: linear-gradient(to top, var(--theme-gray-900) 0%, var(--theme-gray-800) 50%, var(--theme-gray-800) 100%); } #mb_login {