diff options
| author | friendica <info@friendica.com> | 2013-01-11 02:19:46 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-01-11 02:19:46 -0800 |
| commit | 89423844bbcfb8f62dd1672dd103ce6e8018a2e2 (patch) | |
| tree | c70f464300f4680bfd9ab611cff68157232c95e4 | |
| parent | d60a07c4f7190c98f38aad059fba1740f4970bdd (diff) | |
| download | volse-hubzilla-89423844bbcfb8f62dd1672dd103ce6e8018a2e2.tar.gz volse-hubzilla-89423844bbcfb8f62dd1672dd103ce6e8018a2e2.tar.bz2 volse-hubzilla-89423844bbcfb8f62dd1672dd103ce6e8018a2e2.zip | |
network & home notification fixes
| -rw-r--r-- | include/notify.php | 15 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/include/notify.php b/include/notify.php index 3bc29619d..3bfd1e58c 100644 --- a/include/notify.php +++ b/include/notify.php @@ -15,20 +15,19 @@ function format_notification($item) { localize_item($item); -// FIXME - we may need the parent - - if(! $item['localize']) { + if($item_localize) { + $itemem_text = $item['localize']; + } + else { $itemem_text = (($item['item_flags'] & ITEM_THREAD_TOP) - ? sprintf( t("%s created a new post"), $item['author']['xchan_name']) - : sprintf( t("%s commented on %s's post"), $item['author']['xchan_name'], $item['pname'])); + ? t('created a new post') + : sprintf( t('commented on %s\'s post'), $item['owner']['xchan_name'])); } - else - $itemem_text = $item['localize']; // convert this logic into a json array just like the system notifications return array( - 'notify_link' => z_root() . '/display/' . $item['llink'], + 'notify_link' => $item['llink'], 'name' => $item['author']['xchan_name'], 'url' => $item['author']['xchan_url'], 'photo' => $item['author']['xchan_photo_s'], diff --git a/version.inc b/version.inc index 73213556d..6a044ad1a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-01-09.195 +2013-01-10.196 |