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

g5 merge 충돌수정

Browse Source
This commit is contained in:
chicpro
2014-02-03 11:22:49 +09:00
parent 14a394750d b6f76f8885
commit c2fd1d0470
9 changed files with 661 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/common.lib.php
View File

@ -386,11 +386,11 @@ function get_list($write_row, $board, $skin_url, $subject_len=40)
$list['comment_href'] = $list['href'];
$list['icon_new'] = '';
if ($list['wr_datetime'] >= date("Y-m-d H:i:s", G5_SERVER_TIME - ($board['bo_new'] * 3600)))
if ($board['bo_new'] && $list['wr_datetime'] >= date("Y-m-d H:i:s", G5_SERVER_TIME - ($board['bo_new'] * 3600)))
$list['icon_new'] = '<img src="'.$skin_url.'/img/icon_new.gif" alt="새글">';
$list['icon_hot'] = '';
if ($list['wr_hit'] >= $board['bo_hot'])
if ($board['bo_hot'] && $list['wr_hit'] >= $board['bo_hot'])
$list['icon_hot'] = '<img src="'.$skin_url.'/img/icon_hot.gif" alt="인기글">';
$list['icon_secret'] = '';