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

This commit is contained in:
whitedot
2013-02-20 09:45:33 +09:00
3 changed files with 5 additions and 5 deletions

View File

@ -260,7 +260,7 @@ function image_window(img)
win=window.open("","image_window",settings);
win.document.open();
win.document.write ("<html><head> \n<meta http-equiv='imagetoolbar' CONTENT='no'> \n<meta http-equiv='content-type' content='text/html; charset="+g4_charset+"'>\n");
win.document.write ("<html><head> \n<meta http-equiv='imagetoolbar' CONTENT='no'> \n<meta http-equiv='content-type' content='text/html; charset=utf-8'>\n");
var size = "이미지 사이즈 : "+w+" x "+h;
win.document.write ("<title>"+size+"</title> \n");
if(w >= screen.width || h >= screen.height) {

View File

@ -8,7 +8,8 @@ function it_img_thumb($filename, $filepath, $thumb_width, $thumb_height, $is_cre
return thumbnail($filename, $filepath, $filepath, $thumb_width, $thumb_height, $is_create);
}
function get_board_contents($contents)
// 게시글보기 썸네일 생성
function get_view_thumbnail($contents)
{
if(!G4_IS_MOBILE)
return $contents;

View File

@ -127,7 +127,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
for ($i=0; $i<=count($view['file']); $i++) {
if ($view['file'][$i]['view']) {
//echo $view['file'][$i]['view'];
echo get_board_contents($view['file'][$i]['view']);
echo get_view_thumbnail($view['file'][$i]['view']);
}
}
@ -135,7 +135,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
}
?>
<div id="bo_v_con"><?=get_board_contents($view['content']);?></div>
<div id="bo_v_con"><?=get_view_thumbnail($view['content']);?></div>
<?//echo $view[rich_content]; // {이미지:0} 과 같은 코드를 사용할 경우?>
<!-- 테러 태그 방지용 --></xml></xmp><a href=""></a><a href=''></a>
@ -178,7 +178,6 @@ function board_move(href)
}
</script>
<script src="<?=G4_JS_URL?>/board.js"></script>
<!-- 게시글 보기 끝 -->
<script>