diff options
| author | friendica <info@friendica.com> | 2014-01-27 23:49:42 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-01-27 23:49:42 -0800 |
| commit | f104b4dc275891785ec03abd779d8aafe5163815 (patch) | |
| tree | 69ea6813ba12817d2bf077a0e5a47f00ed8edeae /include | |
| parent | 8c80589b5ab196287788ff385733dec1df005044 (diff) | |
| download | volse-hubzilla-f104b4dc275891785ec03abd779d8aafe5163815.tar.gz volse-hubzilla-f104b4dc275891785ec03abd779d8aafe5163815.tar.bz2 volse-hubzilla-f104b4dc275891785ec03abd779d8aafe5163815.zip | |
preserve expiration when editing
Diffstat (limited to 'include')
| -rw-r--r-- | include/ItemObject.php | 2 | ||||
| -rw-r--r-- | include/conversation.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index 9a62cee4b..e9a0b65c0 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -218,7 +218,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')):''), + 'expiretime' => (($item['expires'] !== '0000-00-00 00:00:00') ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''), 'lock' => $lock, 'verified' => $verified, 'unverified' => $unverified, 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, |