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

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

Browse Source
This commit is contained in:
thisgun
2017-12-04 16:02:42 +09:00
parent fd1ec11ad1 6c4353fffe
commit 5a424d5977
8 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/admin.lib.php
View File

@ -176,7 +176,7 @@ function get_theme_config_value($dir, $key='*')
$tconfig = array();
$theme_config_file = G5_PATH.'/'.G5_THEME_DIR.'/'.$dir.'/theme.config.php';
if(is_file) {
if(is_file($theme_config_file)) {
include($theme_config_file);
if($key == '*') {

4
bbs/group.php
View File

@ -28,9 +28,9 @@ include_once(G5_LIB_PATH.'/latest.lib.php');
<?php
// 최신글
$sql = " select bo_table, bo_subject
from {$g5[board_table]}
from {$g5['board_table']}
where gr_id = '{$gr_id}'
and bo_list_level <= '{$member[mb_level]}'
and bo_list_level <= '{$member['mb_level']}'
and bo_device <> 'mobile' ";
if(!$is_admin)
$sql .= " and bo_use_cert = '' ";

4
common.php
View File

@ -139,7 +139,7 @@ if (file_exists($dbconfig_file)) {
sql_set_charset('utf8', $connect_db);
if(defined('G5_MYSQL_SET_MODE') && G5_MYSQL_SET_MODE) sql_query("SET SESSION sql_mode = ''");
if (defined(G5_TIMEZONE)) sql_query(" set time_zone = '".G5_TIMEZONE."'");
if (defined('G5_TIMEZONE')) sql_query(" set time_zone = '".G5_TIMEZONE."'");
} else {
?>
@ -485,7 +485,7 @@ if(isset($config['cf_theme']) && trim($config['cf_theme'])) {
// 테마 설정 로드
if(is_file(G5_THEME_PATH.'/theme.config.php'))
if(defined('G5_THEME_PATH') && is_file(G5_THEME_PATH.'/theme.config.php'))
include_once(G5_THEME_PATH.'/theme.config.php');
//=====================================================================================

10
mobile/skin/popular/basic/popular.skin.php
View File

@ -9,9 +9,15 @@ add_stylesheet('<link rel="stylesheet" href="'.$popular_skin_url.'/style.css">',
<div>
<h2>인기검색어</h2>
<ul>
<?php for ($i=0; $i<count($list); $i++) { ?>
<?php
if( isset($list) && is_array($list) ){
for ($i=0; $i<count($list); $i++) {
?>
<li><a href="<?php echo G5_BBS_URL ?>/search.php?sfl=wr_subject&amp;sop=and&amp;stx=<?php echo urlencode($list[$i]['pp_word']) ?>"><?php echo get_text($list[$i]['pp_word']); ?></a></li>
<?php } ?>
<?php
} //end for
} //end if
?>
</ul>
</div>
</aside>

12
skin/popular/basic/popular.skin.php
View File

@ -10,9 +10,15 @@ add_stylesheet('<link rel="stylesheet" href="'.$popular_skin_url.'/style.css">',
<div>
<h2>인기검색어</h2>
<ul>
<?php for ($i=0; $i<count($list); $i++) { ?>
<li><a href="<?php echo G5_BBS_URL ?>/search.php?sfl=wr_subject&amp;sop=and&amp;stx=<?php echo urlencode($list[$i]['pp_word']) ?>"><?php echo get_text($list[$i]['pp_word']); ?></a></li>
<?php } ?>
<?php
if( isset($list) && is_array($list) ){
for ($i=0; $i<count($list); $i++) {
?>
<li><a href="<?php echo G5_BBS_URL ?>/search.php?sfl=wr_subject&amp;sop=and&amp;stx=<?php echo urlencode($list[$i]['pp_word']) ?>"><?php echo get_text($list[$i]['pp_word']); ?></a></li>
<?php
} //end for
} //end if
?>
</ul>
</div>
</section>

4
theme/basic/group.php
View File

@ -19,9 +19,9 @@ include_once(G5_LIB_PATH.'/latest.lib.php');
<?php
// 최신글
$sql = " select bo_table, bo_subject
from {$g5[board_table]}
from {$g5['board_table']}
where gr_id = '{$gr_id}'
and bo_list_level <= '{$member[mb_level]}'
and bo_list_level <= '{$member['mb_level']}'
and bo_device <> 'mobile' ";
if(!$is_admin)
$sql .= " and bo_use_cert = '' ";

10
theme/basic/mobile/skin/popular/basic/popular.skin.php
View File

@ -9,9 +9,15 @@ add_stylesheet('<link rel="stylesheet" href="'.$popular_skin_url.'/style.css">',
<div>
<h2>인기검색어</h2>
<ul>
<?php for ($i=0; $i<count($list); $i++) { ?>
<?php
if( isset($list) && is_array($list) ){
for ($i=0; $i<count($list); $i++) {
?>
<li><a href="<?php echo G5_BBS_URL ?>/search.php?sfl=wr_subject&amp;sop=and&amp;stx=<?php echo urlencode($list[$i]['pp_word']) ?>"><?php echo get_text($list[$i]['pp_word']); ?></a></li>
<?php } ?>
<?php
} //end for
} //end if
?>
</ul>
</div>
</aside>

12
theme/basic/skin/popular/basic/popular.skin.php
View File

@ -10,9 +10,15 @@ add_stylesheet('<link rel="stylesheet" href="'.$popular_skin_url.'/style.css">',
<div>
<h2>인기검색어</h2>
<ul>
<?php for ($i=0; $i<count($list); $i++) { ?>
<li><a href="<?php echo G5_BBS_URL ?>/search.php?sfl=wr_subject&amp;sop=and&amp;stx=<?php echo urlencode($list[$i]['pp_word']) ?>"><?php echo get_text($list[$i]['pp_word']); ?></a></li>
<?php } ?>
<?php
if( isset($list) && is_array($list) ){
for ($i=0; $i<count($list); $i++) {
?>
<li><a href="<?php echo G5_BBS_URL ?>/search.php?sfl=wr_subject&amp;sop=and&amp;stx=<?php echo urlencode($list[$i]['pp_word']) ?>"><?php echo get_text($list[$i]['pp_word']); ?></a></li>
<?php
} //end for
} //end if
?>
</ul>
</div>
</section>