Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-28 00:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge

Browse source
This commit is contained in:
Michael 2020-04-28 13:33:03 +00:00
parent c2a9b3b9e9
commit 70e5639e29
17 changed files with 34 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Protocol/ActivityPub/Transmitter.php
View file

@ -96,6 +96,7 @@ class Transmitter
while ($contact = DBA::fetch($contacts)) {
$list[] = $contact['url'];
}
DBA::close($contacts);
if (!empty($list)) {
$data['next'] = DI::baseUrl() . '/followers/' . $owner['nickname'] . '?page=' . ($page + 1);
@ -145,6 +146,7 @@ class Transmitter
while ($contact = DBA::fetch($contacts)) {
$list[] = $contact['url'];
}
DBA::close($contacts);
if (!empty($list)) {
$data['next'] = DI::baseUrl() . '/following/' . $owner['nickname'] . '?page=' . ($page + 1);

4
src/Protocol/Diaspora.php
View file

@ -122,6 +122,7 @@ class Diaspora
while ($server = DBA::fetch($servers)) {
$serverlist[$server['url']] = $server['url'];
}
DBA::close($servers);
// All tags of the current post
$tags = DBA::select('tag-view', ['name'], ['uri-id' => $parent['uri-id'], 'type' => Tag::HASHTAG]);
@ -138,6 +139,7 @@ class Diaspora
while ($server = DBA::fetch($tagserver)) {
$tagserverlist[] = $server['gserver-id'];
}
DBA::close($tagserver);
}
// All adresses with the given id
@ -146,6 +148,7 @@ class Diaspora
while ($server = DBA::fetch($servers)) {
$serverlist[$server['url']] = $server['url'];
}
DBA::close($servers);
}
}
@ -1718,6 +1721,7 @@ class Diaspora
while ($contact = DBA::fetch($contacts)) {
Contact::remove($contact["id"]);
}
DBA::close($contacts);
DBA::delete('gcontact', ['addr' => $author]);