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

g4s merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2013-06-26 12:04:11 +09:00
parent a49a7e9747 865035aff0
commit 8d8b107b70
9 changed files with 55 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/common.lib.php
View File

@ -432,7 +432,11 @@ function get_list($write_row, $board, $skin_url, $subject_len=40)
}
// 가변 파일
$list['file'] = get_file($board['bo_table'], $list['wr_id']);
if ($board['bo_use_list_file'] || ($list['wr_file'] && $subject_len == 255) /* view 인 경우 */) {
$list['file'] = get_file($board['bo_table'], $list['wr_id']);
} else {
$list['file']['count'] = $list['wr_file'];
}
if ($list['file']['count'])
$list['icon_file'] = '<img src="'.$skin_url.'/img/icon_file.gif" alt="첨부파일">';
@ -441,9 +445,9 @@ function get_list($write_row, $board, $skin_url, $subject_len=40)
}
// get_list 의 alias
function get_view($write_row, $board, $skin_url, $subject_len=125)
function get_view($write_row, $board, $skin_url)
{
return get_list($write_row, $board, $skin_url, $subject_len);
return get_list($write_row, $board, $skin_url, 255);
}