diff options
| author | friendica <redmatrix@redmatrix.me> | 2015-04-03 17:14:25 -0700 |
|---|---|---|
| committer | friendica <redmatrix@redmatrix.me> | 2015-04-03 17:14:25 -0700 |
| commit | 60e94b315cb326b068eaccb7705ecc02f26302f0 (patch) | |
| tree | c90e9084818b92379c90114e26a9c6e40b8f21e3 /include/conversation.php | |
| parent | f18621c6db12fee15a021ceacbf9b973e5cc4374 (diff) | |
| parent | c2517eca56a032c33208a786dc2734919e31c8e6 (diff) | |
| download | volse-hubzilla-60e94b315cb326b068eaccb7705ecc02f26302f0.tar.gz volse-hubzilla-60e94b315cb326b068eaccb7705ecc02f26302f0.tar.bz2 volse-hubzilla-60e94b315cb326b068eaccb7705ecc02f26302f0.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index 042d01b3e..67f3afde0 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -713,7 +713,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ 'text' => strip_tags($body), 'ago' => relative_date($item['created']), 'app' => $item['app'], - 'str_app' => sprintf( t(' from %s'), $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'), 'editedtime' => (($item['edited'] != $item['created']) ? sprintf( t('last edited: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r')) : ''), |