diff options
| author | Michael Meer <michael@meer.name> | 2014-01-28 09:49:09 +0100 |
|---|---|---|
| committer | Michael Meer <michael@meer.name> | 2014-01-28 09:49:09 +0100 |
| commit | 8ddee71c2b0f384470965dd46a2e594a4f98f8e0 (patch) | |
| tree | 84bcf6e0f94365b186b4613b43d7a72f5f22f525 /include/conversation.php | |
| parent | 904db593df914d2932d9c2f018b00987052461d7 (diff) | |
| parent | f104b4dc275891785ec03abd779d8aafe5163815 (diff) | |
| download | volse-hubzilla-8ddee71c2b0f384470965dd46a2e594a4f98f8e0.tar.gz volse-hubzilla-8ddee71c2b0f384470965dd46a2e594a4f98f8e0.tar.bz2 volse-hubzilla-8ddee71c2b0f384470965dd46a2e594a4f98f8e0.zip | |
Merge branch 'master' of https://github.com/friendica/red
to be in sync with main repro
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, |