diff options
| author | redmatrix <mike@macgirvin.com> | 2016-09-26 18:17:38 -0700 |
|---|---|---|
| committer | redmatrix <mike@macgirvin.com> | 2016-09-26 18:17:38 -0700 |
| commit | 4663278f52fd11c1014d13151af2bc6ef1392c7d (patch) | |
| tree | 5ea36ed7db723a1d0abfd99c5e7d21f9e72cf12a /Zotlabs/Lib/ThreadItem.php | |
| parent | 5716556766eb4e329f0c6c1bc899a7621cbcd5a5 (diff) | |
| parent | cacdac16aa104eb1308f69f24fef31f682934fca (diff) | |
| download | volse-hubzilla-4663278f52fd11c1014d13151af2bc6ef1392c7d.tar.gz volse-hubzilla-4663278f52fd11c1014d13151af2bc6ef1392c7d.tar.bz2 volse-hubzilla-4663278f52fd11c1014d13151af2bc6ef1392c7d.zip | |
Merge branch 'nulldate' into dev
Diffstat (limited to 'Zotlabs/Lib/ThreadItem.php')
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index ef73ed793..a3e871810 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -349,7 +349,7 @@ class ThreadItem { 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'c'), 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'), 'editedtime' => (($item['edited'] != $item['created']) ? sprintf( t('last edited: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r')) : ''), - 'expiretime' => (($item['expires'] !== NULL_DATE) ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''), + 'expiretime' => (($item['expires'] > NULL_DATE) ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''), 'lock' => $lock, 'verified' => $verified, 'unverified' => $unverified, |