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 into g5

Browse Source
This commit is contained in:
chicpro
2015-08-26 10:33:01 +09:00
parent f9d415d4d7 36e88a6a2d
commit a243ddafc7
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/thumbnail.lib.php
View File

@ -59,15 +59,19 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_
if($tname) { if($tname) {
if($edt) { if($edt) {
// 오리지날 이미지
$ori = G5_URL.$data_path;
// 썸네일 이미지
$src = G5_URL.str_replace($filename, $tname, $data_path); $src = G5_URL.str_replace($filename, $tname, $data_path);
} else { } else {
$ori = G5_DATA_URL.'/file/'.$bo_table.'/'.$filename;
$src = G5_DATA_URL.'/file/'.$bo_table.'/'.$tname; $src = G5_DATA_URL.'/file/'.$bo_table.'/'.$tname;
} }
} else { } else {
return false; return false;
} }
$thumb = array("src"=>$src, "alt"=>$alt); $thumb = array("src"=>$src, "ori"=>$ori, "alt"=>$alt);
return $thumb; return $thumb;
} }

4
plugin/kcpcert/lib/ct_cli_lib.php
View File

@ -93,7 +93,9 @@ class C_CT_CLI
while ( list(,$i) = each($arg) ) while ( list(,$i) = each($arg) )
{ {
$exec_cmd .= " " . escapeshellarg( $i ); // 일부서버의 경우 빈값일때 '' 결과가 넘어오지 않는 버그가 있다. kagla 150820
//$exec_cmd .= " " . escapeshellarg( $i );
$exec_cmd .= " " . ( escapeshellarg($i) ? escapeshellarg($i) : "''" );
} }
$rt = exec( $exec_cmd ); $rt = exec( $exec_cmd );