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

adm/board_list.php

@@ -138,7 +138,7 @@ $colspan = 15;
             <a href="<?php echo G5_BBS_URL ?>/board.php?bo_table=<?php echo $row['bo_table'] ?>"><?php echo $row['bo_table'] ?></a>
         </td>
         <td>
-            <label for="bo_skin_<?php echo $i; ?>" class="sound_only">모바일 스킨</label>
+            <label for="bo_skin_<?php echo $i; ?>" class="sound_only">스킨</label>
             <?php echo get_skin_select('board', 'bo_skin_'.$i, "bo_skin[$i]", $row['bo_skin']); ?>
         </td>
         <td>

adm/contentform.php

@@ -67,7 +67,7 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
     </tr>
     <tr>
         <th scope="row">내용</th>
-        <td><?php echo editor_html('co_content', $co['co_content']); ?></td>
+        <td><?php echo editor_html('co_content', get_text($co['co_content'], 0)); ?></td>
     </tr>
     <tr>
         <th scope="row"><label for="co_tag_filter_use">태그 필터링 사용</label></th>

adm/faqform.php

@@ -9,7 +9,6 @@ $sql = " select * from {$g5['faq_master_table']} where fm_id = '$fm_id' ";
 $fm = sql_fetch($sql);
 
 $html_title = 'FAQ '.$fm['fm_subject'];;
-$g5['title'] = $html_title.' 관리';
 
 if ($w == "u")
 {
@@ -26,6 +25,8 @@ if ($w == "u")
 else
     $html_title .= ' 항목 입력';
 
+$g5['title'] = $html_title.' 관리';
+
 include_once (G5_ADMIN_PATH.'/admin.head.php');
 ?>
 

adm/faqmasterform.php

@@ -6,7 +6,6 @@ include_once(G5_EDITOR_LIB);
 auth_check($auth[$sub_menu], "w");
 
 $html_title = 'FAQ';
-$g5['title'] = $html_title.' 관리';
 
 if ($w == "u")
 {
@@ -22,6 +21,8 @@ else
     $html_title .= ' 입력';
 }
 
+$g5['title'] = $html_title.' 관리';
+
 // 모바일 상하단 내용 필드추가
 if(!sql_query(" select fm_mobile_head_html from {$g5['faq_master_table']} limit 1 ", false)) {
     sql_query(" ALTER TABLE `{$g5['faq_master_table']}`

lib/common.lib.php

@@ -2045,7 +2045,7 @@ function get_editor_image($contents, $view=true)
     if ($view)
         $pattern = "/<img([^>]*)>/iS";
     else
-        $pattern = "/<img[^>]*src=[\'\"]?([^>\'\"]+[^>\'\"]+)[\'\"]?[^>]*>/";
+        $pattern = "/<img[^>]*src=[\'\"]?([^>\'\"]+[^>\'\"]+)[\'\"]?[^>]*>/i";
     preg_match_all($pattern, $contents, $matchs);
 
     return $matchs;