firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

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

Browse Source
This commit is contained in:
SIR
2014-10-16 17:27:19 +09:00
parent 4ec01eacd9 2d482e5a73
commit 61c3ea12ba
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/board_list.php
View File

@ -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> <a href="<?php echo G5_BBS_URL ?>/board.php?bo_table=<?php echo $row['bo_table'] ?>"><?php echo $row['bo_table'] ?></a>
</td> </td>
<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']); ?> <?php echo get_skin_select('board', 'bo_skin_'.$i, "bo_skin[$i]", $row['bo_skin']); ?>
</td> </td>
<td> <td>

2
adm/contentform.php
View File

@ -67,7 +67,7 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
</tr> </tr>
<tr> <tr>
<th scope="row">내용</th> <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>
<tr> <tr>
<th scope="row"><label for="co_tag_filter_use">태그 필터링 사용</label></th> <th scope="row"><label for="co_tag_filter_use">태그 필터링 사용</label></th>

3
adm/faqform.php
View File

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

3
adm/faqmasterform.php
View File

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

2
lib/common.lib.php
View File

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