From 541cb5244d2d1d2bdd3a36e444eefae4df9a0b92 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 14 Oct 2014 09:02:38 +0900 Subject: [PATCH 1/4] =?UTF-8?q?get=5Feditor=5Fimage=20=ED=95=A8=EC=88=98?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EB=8C=80=EC=86=8C=EB=AC=B8=EC=9E=90=20?= =?UTF-8?q?=EA=B5=AC=EB=B6=84=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index 4bd59b75e..f14f81dae 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -2045,7 +2045,7 @@ function get_editor_image($contents, $view=true) if ($view) $pattern = "/]*)>/iS"; else - $pattern = "/]*src=[\'\"]?([^>\'\"]+[^>\'\"]+)[\'\"]?[^>]*>/"; + $pattern = "/]*src=[\'\"]?([^>\'\"]+[^>\'\"]+)[\'\"]?[^>]*>/i"; preg_match_all($pattern, $contents, $matchs); return $matchs; From acbd99f2edc9ba2fb0bdfd4d4fbd55d9ac3c11e8 Mon Sep 17 00:00:00 2001 From: thisgun Date: Wed, 15 Oct 2014 10:20:49 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EB=82=B4=EC=9A=A9=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=93=B0=EA=B8=B0=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/contentform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/contentform.php b/adm/contentform.php index 730d3072b..8f00030ff 100644 --- a/adm/contentform.php +++ b/adm/contentform.php @@ -67,7 +67,7 @@ include_once (G5_ADMIN_PATH.'/admin.head.php'); 내용 - + From 6fb06a056437aa5265ed2410758d380bc940b119 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 15 Oct 2014 16:03:57 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/board_list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/board_list.php b/adm/board_list.php index 47be2d2a3..1c51da1d2 100644 --- a/adm/board_list.php +++ b/adm/board_list.php @@ -138,7 +138,7 @@ $colspan = 15; - + From f65540dd19b44dba9c0160f5f0f02ee295aa449f Mon Sep 17 00:00:00 2001 From: thisgun Date: Wed, 15 Oct 2014 17:00:07 +0900 Subject: [PATCH 4/4] =?UTF-8?q?FAQ=20=EA=B4=80=EB=A6=AC=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/faqform.php | 3 ++- adm/faqmasterform.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/adm/faqform.php b/adm/faqform.php index b3852c07e..c9514b4c2 100644 --- a/adm/faqform.php +++ b/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'); ?> diff --git a/adm/faqmasterform.php b/adm/faqmasterform.php index 54a5f67ad..84100dcbc 100644 --- a/adm/faqmasterform.php +++ b/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']}`