diff options
| author | marijus <mario@localhost.localdomain> | 2014-01-30 00:08:40 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-01-30 00:08:40 +0100 |
| commit | a58239b9a8d8c35fa0e0b916617fa53d1014da58 (patch) | |
| tree | 4ebaf732d319efb80d9edebd941fb0be9e35cc06 /include/conversation.php | |
| parent | b39475db86eca7b5e5615d377d8adc64e6a33056 (diff) | |
| parent | fe2b6f3dfb4a9473905dde49b7741a6c03699c23 (diff) | |
| download | volse-hubzilla-a58239b9a8d8c35fa0e0b916617fa53d1014da58.tar.gz volse-hubzilla-a58239b9a8d8c35fa0e0b916617fa53d1014da58.tar.bz2 volse-hubzilla-a58239b9a8d8c35fa0e0b916617fa53d1014da58.zip | |
Merge branch 'upstream'
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/conversation.php b/include/conversation.php index 34d661004..316bc1612 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -687,6 +687,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ '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'] !== '0000-00-00 00:00:00') ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''), 'location' => $location, 'indent' => '', 'owner_name' => $owner_name, |