mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-14 11:36:21 +02:00
Code Issues Releases Wiki Activity

Fix for computeLapse() displaying just "in" by itself.

Browse Source
This commit is contained in:
Cameron
2021-01-08 13:49:23 -08:00
parent 0fabc9aa9c
commit 487c10fc1d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_handlers/date_handler.php
View File

@ -597,7 +597,9 @@ class e_date
*/ */
function computeLapse($older_date, $newer_date = FALSE, $mode = FALSE, $show_secs = TRUE, $format = 'long') function computeLapse($older_date, $newer_date = FALSE, $mode = FALSE, $show_secs = TRUE, $format = 'long')
{ {
if($newer_date === false) $older_date = (int) $older_date;
if(empty($newer_date))
{ {
$newer_date = time(); $newer_date = time();
} }
@ -635,6 +637,8 @@ class e_date
'seconds' => array($interval->s, $sec, $secs), 'seconds' => array($interval->s, $sec, $secs),
); );
if($show_secs !== true) if($show_secs !== true)
{ {
unset($result['seconds']); unset($result['seconds']);
@ -654,7 +658,7 @@ class e_date
if($format === 'short') { break; } if($format === 'short') { break; }
} }
if(strpos($ret[0],$sec) !== false) if(empty($ret) || strpos($ret[0],$sec) !== false)
{ {
$justNow = deftrue('LANDT_10',"Just now"); $justNow = deftrue('LANDT_10',"Just now");
return $mode ? array($justNow) : $justNow; return $mode ? array($justNow) : $justNow;