diff options
| author | friendica <info@friendica.com> | 2013-12-23 15:15:56 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-23 15:15:56 -0800 |
| commit | 49d2ada4f893e4de17567b40873b31e5a63ec01e (patch) | |
| tree | 82582d27daace801a71c7a69268fe2f357a45a2d /include | |
| parent | 63a42480c7eb36bdc8b63b31b2a4d222ba5751cd (diff) | |
| parent | f3abd76e04b3a9d5497ed7f9b72ba53a18f436bb (diff) | |
| download | volse-hubzilla-49d2ada4f893e4de17567b40873b31e5a63ec01e.tar.gz volse-hubzilla-49d2ada4f893e4de17567b40873b31e5a63ec01e.tar.bz2 volse-hubzilla-49d2ada4f893e4de17567b40873b31e5a63ec01e.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'include')
| -rw-r--r-- | include/ItemObject.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index 6088a2c1c..170f013a1 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -217,6 +217,7 @@ class Item extends BaseObject { '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'] > 0) ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''), 'lock' => $lock, 'verified' => $verified, 'unverified' => $unverified, |