From 8d3a5958c62a7c27f4aed65722eaa14708cf82e9 Mon Sep 17 00:00:00 2001 From: thisgun Date: Thu, 25 Jan 2018 16:46:20 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=AC=B8=EB=B2=95=20=EA=B3=A0=EC=B9=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/write.php | 2 +- bbs/write_update.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bbs/write.php b/bbs/write.php index 9481f3629..3a74500c0 100644 --- a/bbs/write.php +++ b/bbs/write.php @@ -386,7 +386,7 @@ else $captcha_html = ''; $captcha_js = ''; -$is_use_captcha = ((($board['bo_use_captcha'] && $w!=='u') || $is_guest) && !$is_admin) ? 1 : 0; +$is_use_captcha = ((($board['bo_use_captcha'] && $w !== 'u') || $is_guest) && !$is_admin) ? 1 : 0; if ($is_use_captcha) { $captcha_html = captcha_html(); diff --git a/bbs/write_update.php b/bbs/write_update.php index 590380f95..9cf4fba95 100644 --- a/bbs/write_update.php +++ b/bbs/write_update.php @@ -188,7 +188,7 @@ if ($w == '' || $w == 'u') { alert('w 값이 제대로 넘어오지 않았습니다.'); } -$is_use_captcha = ((($board['bo_use_captcha'] && $w!=='u') || $is_guest) && !$is_admin) ? 1 : 0; +$is_use_captcha = ((($board['bo_use_captcha'] && $w !== 'u') || $is_guest) && !$is_admin) ? 1 : 0; if ($is_use_captcha && !chk_captcha()) { alert('자동등록방지 숫자가 틀렸습니다.'); From 049cabb937ddb0eebb8abd1e50f691c8bfa60765 Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 26 Jan 2018 11:21:19 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=ED=97=A4?= =?UTF-8?q?=EB=93=9C=20=ED=83=80=EC=9D=B4=ED=8B=80=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/board.php | 6 ++++-- head.php | 2 +- lib/common.lib.php | 10 ++++++++++ mobile/head.php | 2 +- theme/basic/head.php | 2 +- theme/basic/mobile/head.php | 2 +- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/bbs/board.php b/bbs/board.php index 4d734128c..e43ab2881 100644 --- a/bbs/board.php +++ b/bbs/board.php @@ -16,6 +16,8 @@ if (!$bo_table) { alert($msg); } +$g5['board_title'] = ((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']); + // wr_id 값이 있으면 글읽기 if (isset($wr_id) && $wr_id) { // 글이 없을 경우 해당 게시판 목록으로 이동 @@ -136,7 +138,7 @@ if (isset($wr_id) && $wr_id) { set_session($ss_name, TRUE); } - $g5['title'] = strip_tags(conv_subject($write['wr_subject'], 255))." > ".((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']); + $g5['title'] = strip_tags(conv_subject($write['wr_subject'], 255))." > ".$g5['board_title']; } else { if ($member['mb_level'] < $board['bo_list_level']) { if ($member['mb_id']) @@ -171,7 +173,7 @@ if (isset($wr_id) && $wr_id) { if (!isset($page) || (isset($page) && $page == 0)) $page = 1; - $g5['title'] = ((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']).' '.$page.' 페이지'; + $g5['title'] = $g5['board_title'].' '.$page.' 페이지'; } include_once(G5_PATH.'/head.sub.php'); diff --git a/head.php b/head.php index f8924ae09..591223b04 100644 --- a/head.php +++ b/head.php @@ -228,5 +228,5 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
-

+

diff --git a/lib/common.lib.php b/lib/common.lib.php index 9b36517ef..46a371b2d 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -3363,6 +3363,16 @@ function get_member_profile_img($mb_id='', $width='', $height='', $alt='profile_ return ''; } +function get_head_title($title){ + global $g5; + + if( isset($g5['board_title']) && $g5['board_title'] ){ + $title = $g5['board_title']; + } + + return $title; +} + function is_use_email_certify(){ global $config; diff --git a/mobile/head.php b/mobile/head.php index 82ad5bda7..03d1c2d3b 100644 --- a/mobile/head.php +++ b/mobile/head.php @@ -207,4 +207,4 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
-

+

diff --git a/theme/basic/head.php b/theme/basic/head.php index 2534e0380..5d23bf5e1 100644 --- a/theme/basic/head.php +++ b/theme/basic/head.php @@ -223,5 +223,5 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
-

+

diff --git a/theme/basic/mobile/head.php b/theme/basic/mobile/head.php index 237cc0579..a63bb027a 100644 --- a/theme/basic/mobile/head.php +++ b/theme/basic/mobile/head.php @@ -189,4 +189,4 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
-

+