diff --git a/mod/salmon.php b/mod/salmon.php index de8d971334..3d32d3e3a9 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -158,7 +158,7 @@ function salmon_post(App $a, $xml = '') { * */ - $contact = DBA::selectFirst('contact', ["`network` IN (?, ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `uid` = ?", + $contact = DBA::selectFirst('contact', [], ["`network` IN (?, ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `uid` = ?", Protocol::OSTATUS, Protocol::DFRN, Strings::normaliseLink($author_link), $author_link, Strings::normaliseLink($author_link), $importer['uid']]); if (!empty($contact['gsid'])) { diff --git a/src/Worker/Contact/RemoveContent.php b/src/Worker/Contact/RemoveContent.php index cc9139c2c8..8baa1f0973 100644 --- a/src/Worker/Contact/RemoveContent.php +++ b/src/Worker/Contact/RemoveContent.php @@ -76,7 +76,8 @@ class RemoveContent Photo::delete(['contact-id' => $id]); - DBA::delete('contact-relation', ['contact-id = ? OR cid = ?', $id, $id]); + DBA::delete('contact-relation', ['contact-id' => $id]); + DBA::delete('contact-relation', ['cid' => $id]); DBA::delete('event', ['cid' => $id]); DBA::delete('fsuggest', ['cid' => $id]); DBA::delete('post-tag', ['cid' => $id]);