Merge branch 'g5'

This commit is contained in:
chicpro
2014-03-12 18:19:41 +09:00
21 changed files with 359 additions and 158 deletions

View File

@ -33,7 +33,7 @@ function get_microtime()
}
// 현재페이지, 총페이지, 페이지에 보여줄 행, URL
// 페이지에 보여줄 행, 현재페이지, 페이지, URL
function get_paging($write_pages, $cur_page, $total_page, $url, $add="")
{
$url = preg_replace('#&page=[0-9]*(&page=)$#', '$1', $url);
@ -2619,4 +2619,15 @@ function htmlspecialchars2($str)
$str = strtr($str, $trans);
return $str;
}
// date 형식 변환
function conv_date_format($format, $date, $add='')
{
if($add)
$timestamp = strtotime($add, strtotime($date));
else
$timestamp = strtotime($date);
return date($format, $timestamp);
}
?>