From 6aa2d5b84e97f6faacbb92f9022ab1c3f5026a23 Mon Sep 17 00:00:00 2001
From: flyskyko <sinsy200@gmail.com>
Date: Thu, 29 Sep 2011 08:18:36 +0000
Subject: [PATCH] issue 195, fixed mis merge

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9431 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 config/func.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/func.inc.php b/config/func.inc.php
index be21d1a79..a5d718bee 100644
--- a/config/func.inc.php
+++ b/config/func.inc.php
@@ -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);