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
2013-10-02 09:13:33 +09:00
parent 21c09985d7 0a1259b3a5
commit 5e05a31146
44 changed files with 811 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/thumbnail.lib.php
View File

@ -86,12 +86,16 @@ function get_view_thumbnail($contents, $thumb_width=0)
// 썸네일 width 설정
$thumb_width = 320;
if($dvc_width >= 1000) {
return $contents;
} else if($dvc_width >= 760 && $dvc_width < 1000) {
$thumb_width = 760;
} else if($dvc_width >= 480 && $dvc_width < 760) {
$thumb_width = 480;
if($dvc_width > $board['bo_image_width']) {
$thumb_width = $board['bo_image_width'];
} else {
if($dvc_width >= 1000) {
$thumb_width = 1000;
} else if($dvc_width >= 760 && $dvc_width < 1000) {
$thumb_width = 760;
} else if($dvc_width >= 480 && $dvc_width < 760) {
$thumb_width = 480;
}
}
} else {
$thumb_width = $board['bo_image_width'];