aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php5
-rw-r--r--include/zot.php4
2 files changed, 3 insertions, 6 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 48a72aa21..e77404cff 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -102,7 +102,7 @@ function localize_item(&$item){
logger('localize_item: failed to decode object: ' . print_r($item['obj'],true));
}
- if($obj['author'] && $obj['author']['link'])
+ if(is_array($obj['author']) && $obj['author']['link'])
$author_link = get_rel_link($obj['author']['link'],'alternate');
elseif(is_array($obj['actor']) && $obj['actor']['url'])
$author_link = ((is_array($obj['actor']['url'])) ? $obj['actor']['url'][0]['href'] : $obj['actor']['url']);
@@ -114,7 +114,8 @@ function localize_item(&$item){
if(!$author_name)
$author_name = ((is_array($obj['actor']) && $obj['actor']['name']) ? $obj['actor']['name'] : '');
- $item_url = get_rel_link($obj['link'],'alternate');
+ if(is_array($obj['link']))
+ $item_url = get_rel_link($obj['link'],'alternate');
if(!$item_url)
$item_url = $obj['id'];
diff --git a/include/zot.php b/include/zot.php
index ce5fd0174..38d6288cf 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2070,10 +2070,6 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
$result[] = $DR->get();
}
else {
-
- hz_syslog(print_r($arr,true));
-
-
$item_result = item_store($arr);
if($item_result['success']) {
$item_id = $item_result['item_id'];