merge with 1.4.5 branch(1.4.5.10)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@9269 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-09-22 05:29:04 +00:00
parent 92332c8ebb
commit a0d57a320f
98 changed files with 970 additions and 432 deletions

View file

@ -413,7 +413,7 @@
* @brief YmdHis의 시간 형식을 지금으로 부터 몇분/몇시간전, 1 이상 차이나면 format string return
**/
function getTimeGap($date, $format = 'Y.m.d') {
$gap = time() - ztime($date);
$gap = time() - zgap() - ztime($date);
$lang_time_gap = Context::getLang('time_gap');
if($gap<60) $buff = sprintf($lang_time_gap['min'], (int)($gap / 60)+1);