diff --git a/include/conversation.php b/include/conversation.php index 88aada4d3..d2dea19a2 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -928,11 +928,8 @@ function builtin_activity_puller($item, &$conv_responses) foreach ($conv_responses as $mode => $v) { - $url = ''; - + if (!$item['author']['xchan_name']) { - logger('Unidentified author for item: ' . $item['id']); - logger('Unidentified item: ' . print_r($item,true), LOGGER_DATA); continue; } switch ($mode) { diff --git a/include/misc.php b/include/misc.php index a447928c1..a0a28ea92 100644 --- a/include/misc.php +++ b/include/misc.php @@ -2720,7 +2720,7 @@ function xchan_query(&$items, $abook = true, $effective_uid = 0) intval($item['uid']) ); } else { - $chans = q("select xchan.*,hubloc.* from xchan left join hubloc on hubloc_hash = xchan_hash left join site on site_url = hubloc_url + $chans = q("select * from xchan left join hubloc on hubloc_hash = xchan_hash left join site on site_url = hubloc_url where xchan_hash in (" . protect_sprintf(implode(',', $arr)) . ") and hubloc_deleted = 0 order by hubloc_primary desc"); } $xchans = q("select * from xchan where xchan_hash in (" . protect_sprintf(implode(',', $arr)) . ") and xchan_network in ('rss','unknown', 'anon')");