gper/Gnuboard5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'renewal2' of github.com:gnuboard/g5 into renewal

Browse Source
This commit is contained in:
thisgun
2018-01-26 11:23:54 +09:00
parent 2aae238d70 049cabb937
commit dc5512cb1b
8 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bbs/board.php
+4 -2
View File
@@ -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');
bbs/write.php
+1 -1
View File
@@ -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();
bbs/write_update.php
+1 -1
View File
@@ -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('자동등록방지 숫자가 틀렸습니다.');
head.php
+1 -1
View File
@@ -228,5 +228,5 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
<div id="container_wr">
<div id="container">
<?php if (!defined("_INDEX_")) { ?><h2 id="container_title"><span><?php echo $g5['title'] ?></span></h2><?php } ?>
<?php if (!defined("_INDEX_")) { ?><h2 id="container_title"><span title="<?php echo get_text($g5['title']); ?>"><?php echo get_head_title($g5['title']); ?></span></h2><?php } ?>
lib/common.lib.php
+10
View File
@@ -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;
mobile/head.php
+1 -1
View File
@@ -207,4 +207,4 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
<div id="wrapper">
<div id="container">
<?php if (!defined("_INDEX_")) { ?><h2 id="container_title" class="top"><?php echo $g5['title'] ?></h2><?php } ?>
<?php if (!defined("_INDEX_")) { ?><h2 id="container_title" class="top" title="<?php echo get_text($g5['title']); ?>"><?php echo get_head_title($g5['title']); ?></h2><?php } ?>
theme/basic/head.php
+1 -1
View File
@@ -223,5 +223,5 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
<div id="container_wr">
<div id="container">
<?php if (!defined("_INDEX_")) { ?><h2 id="container_title"><span><?php echo $g5['title'] ?></span></h2><?php } ?>
<?php if (!defined("_INDEX_")) { ?><h2 id="container_title"><span title="<?php echo get_text($g5['title']); ?>"><?php echo get_head_title($g5['title']); ?></span></h2><?php } ?>
theme/basic/mobile/head.php
+1 -1
View File
@@ -189,4 +189,4 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
<div id="wrapper">
<div id="container">
<?php if (!defined("_INDEX_")) { ?><h2 id="container_title" class="top"><?php echo $g5['title'] ?></h2><?php } ?>
<?php if (!defined("_INDEX_")) { ?><h2 id="container_title" class="top" title="<?php echo get_text($g5['title']); ?>"><?php echo get_head_title($g5['title']); ?></h2><?php } ?>