Merge branch 'master' of github.com:gnuboard/g4s

css/default.css

@@ -27,7 +27,7 @@ tfoot td {border-color:#c9c9c9;background:#f9f9f5;font-weight:bold;text-align:ce
 caption {padding:0 0 10px;text-align:left}
 th {padding:12px 0 8px;border-top:3px solid #666;border-bottom:1px solid #a9a9a9}
 th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
-td {padding:10px 0;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9}
+td {padding:8px 0;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9}
 .empty_table {padding:85px 0;text-align:center}
 
 /* 캡챠 자동등록(입력)방지 기본 */
@@ -319,7 +319,6 @@ a {color:#000;text-decoration:none}
 #bo_list caption {padding:0;height:0;color:transparent;overflow:hidden} /* ff에서 감추기 위해 color:transparent 사용 */
 #bo_list td {line-height:1em}
 #bo_list strong {color:#ff4679}
-#bo_list img {vertical-align:top}
 .bo_notice {background:#f5f5f5}
 .bo_cate_link {display:inline-block;margin:0 5px 0 0;padding:0 8px 0 0;border-right:1px solid #ddd;font-weight:bold;text-decoration:none}
 .bo_current {color:#ff4679}

lib/common.lib.php

@@ -1066,14 +1066,16 @@ function view_link($view, $number, $attribute)
 
 function cut_str($str, $len, $suffix="…")
 {
-    if (strlen($str) >= $len) {
-        $length = floor($len / 3);
+    $arr_str = preg_split("//u", $str, -1, PREG_SPLIT_NO_EMPTY);
+    $str_len = count($arr_str);
 
-        $arr_str = array_slice(preg_split("//u", $str, -1, PREG_SPLIT_NO_EMPTY), 0, $length);
-        $string = join("", $arr_str);
+    if ($str_len >= $len) {
+        $slice_str = array_slice($arr_str, 0, $len);
+        $str = join("", $slice_str);
 
-        return $string . (strlen($str)-strlen($suffix) >= $len ? $suffix : '');
+        return $str . ($str_len > $len ? $suffix : '');
     } else {
+        $str = join("", $arr_str);
         return $str;
     }
 }

skin/board/neo/view_comment.skin.php

@@ -71,7 +71,10 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
     </article>
     <?}?>
 
-    <? if ($is_comment_write) { ?>
+    <? if ($is_comment_write) {
+        if($w == '')
+            $w = 'c';
+    ?>
     <aside id="bo_vc_w">
         <h2>댓글쓰기</h2>
         <form name="fviewcomment" method="post" action="./write_comment_update.php" onsubmit="return fviewcomment_submit(this);" autocomplete="off">