From 89423844bbcfb8f62dd1672dd103ce6e8018a2e2 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 11 Jan 2013 02:19:46 -0800
Subject: network & home notification fixes

---
 include/notify.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'include')

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'],
-- 
cgit v1.2.3