diff options
| author | friendica <info@friendica.com> | 2013-05-21 20:52:18 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-05-21 20:52:18 -0700 |
| commit | c64c79eb119726e359bb4b47d1e30340d96f983d (patch) | |
| tree | 5209eb0fc84c6f68daedf1fc3496efb5585f661f /include | |
| parent | d72d30fabb3e081e0b2c749e512bb3989d9d1f4a (diff) | |
| download | volse-hubzilla-c64c79eb119726e359bb4b47d1e30340d96f983d.tar.gz volse-hubzilla-c64c79eb119726e359bb4b47d1e30340d96f983d.tar.bz2 volse-hubzilla-c64c79eb119726e359bb4b47d1e30340d96f983d.zip | |
fix app display
Diffstat (limited to 'include')
| -rw-r--r-- | include/ItemObject.php | 4 | ||||
| -rwxr-xr-x | include/items.php | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index b3c65008d..ccd192ff5 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -215,9 +215,11 @@ class Item extends BaseObject { 'osparkle' => $osparkle, 'sparkle' => $sparkle, 'title' => $item['title'], + 'ago' => relative_date($item['created']), + 'app' => $item['app'], + 'str_app' => sprintf( t(' from %s'), $item['app']), 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'c'), 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'), - 'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), 'lock' => $lock, 'location' => $location, 'indent' => $indent, diff --git a/include/items.php b/include/items.php index 2a85556df..dbd493724 100755 --- a/include/items.php +++ b/include/items.php @@ -135,7 +135,11 @@ function post_activity_item($arr) { call_hooks('post_local_end', $arr); proc_run('php','include/notifier.php','activity',$post_id); $ret['success'] = true; - $ret['activity'] = $ret; + $r = q("select * from item where id = %d limit 1", + intval($post_id) + ); + if($r) + $ret['activity'] = $r[0]; } return $ret; |