clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10901 from nupplaphil/bug/notify_post 

Fix DB errors
This commit is contained in:
Michael Vogel 2021-10-19 22:43:11 +02:00 committed by GitHub
parent 50c63e8020 88825c2520
commit e2d2f42802
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/salmon.php
View File

@ -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']]); Protocol::OSTATUS, Protocol::DFRN, Strings::normaliseLink($author_link), $author_link, Strings::normaliseLink($author_link), $importer['uid']]);
if (!empty($contact['gsid'])) { if (!empty($contact['gsid'])) {

3
src/Worker/Contact/RemoveContent.php
View File

@ -76,7 +76,8 @@ class RemoveContent
Photo::delete(['contact-id' => $id]); 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('event', ['cid' => $id]);
DBA::delete('fsuggest', ['cid' => $id]); DBA::delete('fsuggest', ['cid' => $id]);
DBA::delete('post-tag', ['cid' => $id]); DBA::delete('post-tag', ['cid' => $id]);