From fd18b42a5a4dfb212dac1272294a0934076183b7 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 19 Sep 2011 03:30:59 -0700
Subject: Check all keys before use

---
 include/conversation.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include/conversation.php')

diff --git a/include/conversation.php b/include/conversation.php
index 4398d6a5c..7cea54db5 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -485,6 +485,7 @@ function conversation(&$a, $items, $mode, $update) {
 
 
 			$tmp_item = replace_macros($template,array(
+				'$body' => $body,
 				'$id' => $item['item_id'],
 				'$linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
 				'$olinktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
@@ -498,7 +499,6 @@ function conversation(&$a, $items, $mode, $update) {
 				'$osparkle' => $osparkle,
 				'$sparkle' => $sparkle,
 				'$title' => $item['title'],
-				'$body' => $body,
 				'$ago' => ((($item['app']) && ($item['id'] == $item['parent'])) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
 				'$lock' => $lock,
 				'$location' => $location,
@@ -514,6 +514,7 @@ function conversation(&$a, $items, $mode, $update) {
 				'$like' => $like,
 				'$dislike' => $dislike,
 				'$comment' => $comment
+
 			));
 
 
-- 
cgit v1.2.3