Merge branch 'develop' into pr/extra-timezones

This commit is contained in:
Kijin Sung 2016-02-12 08:31:43 +09:00
commit 96dfdfc840
5 changed files with 146 additions and 20 deletions

View file

@ -611,7 +611,7 @@ function zdate($str, $format = 'Y-m-d H:i:s', $conversion = false)
*/
function getTimeGap($date, $format = 'Y.m.d')
{
$gap = $_SERVER['REQUEST_TIME'] + zgap() - ztime($date);
$gap = RX_TIME - ztime($date);
$lang_time_gap = Context::getLang('time_gap');
if($gap < 60)