aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-12-23 14:10:51 -0800
committerfriendica <info@friendica.com>2013-12-23 14:10:51 -0800
commitf3abd76e04b3a9d5497ed7f9b72ba53a18f436bb (patch)
treef7cafac2c87a59c94b2d43394e41d2268474206c /include
parent9daa6478556acab40958e61df39c1b7a8fc74d55 (diff)
parent84d8fab6f1a049bb502c370c39fc3b44182ef24c (diff)
downloadvolse-hubzilla-f3abd76e04b3a9d5497ed7f9b72ba53a18f436bb.tar.gz
volse-hubzilla-f3abd76e04b3a9d5497ed7f9b72ba53a18f436bb.tar.bz2
volse-hubzilla-f3abd76e04b3a9d5497ed7f9b72ba53a18f436bb.zip
Merge pull request #253 from cvogeley/master
Show expire date in post tooltip
Diffstat (limited to 'include')
-rw-r--r--include/ItemObject.php1
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,