aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-08-27 18:40:33 -0700
committerfriendica <info@friendica.com>2013-08-27 18:40:33 -0700
commit390a1ce552d57fe5eea6bc2ed43ea0b8bb07c77b (patch)
tree369069091264b842c787e69af04c2e1a52217cab /include
parentb77eaebb3a424247ca3fc7bef5c79b775a2db0e2 (diff)
downloadvolse-hubzilla-390a1ce552d57fe5eea6bc2ed43ea0b8bb07c77b.tar.gz
volse-hubzilla-390a1ce552d57fe5eea6bc2ed43ea0b8bb07c77b.tar.bz2
volse-hubzilla-390a1ce552d57fe5eea6bc2ed43ea0b8bb07c77b.zip
more loose ends
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php5
1 files changed, 4 insertions, 1 deletions
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');