issue 195, fixed mis merge

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9431 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-09-29 08:18:36 +00:00
parent 02731df7b3
commit 6aa2d5b84e

View file

@ -414,7 +414,7 @@
* @brief If the recent post within a day, output format of YmdHis is "min/hours ago from now". If not within a day, it return format string.
**/
function getTimeGap($date, $format = 'Y.m.d') {
$gap = time() - zgap() - 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);