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

Merge pull request #8587 from annando/warning-notices 

Fix warning, notice and DB Error
This commit is contained in:
Hypolite Petovan 2020-05-05 18:08:43 -04:00 committed by GitHub
parent 1c39f2523c 0f042b064a
commit 16e9b3fdca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Database/PostUpdate.php
View File

@ -707,7 +707,7 @@ class PostUpdate
while ($delivery = DBA::fetch($deliveries)) { while ($delivery = DBA::fetch($deliveries)) {
$id = $delivery['iid']; $id = $delivery['iid'];
unset($delivery['iid']); unset($delivery['iid']);
DBA::insert('post-delivery-data', $delivery); DBA::insert('post-delivery-data', $delivery, true);
++$rows; ++$rows;
} }
DBA::close($deliveries); DBA::close($deliveries);

11
src/Protocol/OStatus.php
View File

@ -2073,7 +2073,8 @@ class OStatus
} }
// uri-id isn't present for follow entry pseudo-items // uri-id isn't present for follow entry pseudo-items
foreach (Tag::getByURIId($item['uri-id'] ?? 0) as $tag) { $tags = Tag::getByURIId($item['uri-id'] ?? 0);
foreach ($tags as $tag) {
$mentioned[$tag['url']] = $tag['url']; $mentioned[$tag['url']] = $tag['url'];
} }
@ -2123,11 +2124,9 @@ class OStatus
XML::addElement($doc, $entry, "mastodon:scope", "public"); XML::addElement($doc, $entry, "mastodon:scope", "public");
} }
if (count($tags)) { foreach ($tags as $tag) {
foreach ($tags as $tag) { if ($tag['type'] == Tag::HASHTAG) {
if ($tag['type'] == Tag::HASHTAG) { XML::addElement($doc, $entry, "category", "", ["term" => $tag['name']]);
XML::addElement($doc, $entry, "category", "", ["term" => $tag['name']]);
}
} }
} }