From 390a1ce552d57fe5eea6bc2ed43ea0b8bb07c77b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 27 Aug 2013 18:40:33 -0700
Subject: more loose ends

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

(limited to 'include/conversation.php')

diff --git a/include/conversation.php b/include/conversation.php
index 6e6ffef94..f6a5b90da 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -93,7 +93,10 @@ function localize_item(&$item){
 
 	if (activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE)){
 		
-		$obj = json_decode_plus($item['object']);
+		if(is_array($item['object']))
+			$obj = $item['object'];
+		else
+			$obj = json_decode_plus($item['object']);
 		
 		if($obj['author'] && $obj['author']['link'])
 			$author_link = get_rel_link($obj['author']['link'],'alternate');
-- 
cgit v1.2.3