Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-20 01:03:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixing appending child at DFRN without a parent id.

Browse source
This commit is contained in:
Philipp Holzer 2019-02-24 16:30:09 +01:00
parent df5ea1fab0
commit bf6a765beb
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Protocol/DFRN.php
View file

@ -119,8 +119,10 @@ class DFRN
$item["entry:cid"] = defaults($item, "entry:cid", 0); $item["entry:cid"] = defaults($item, "entry:cid", 0);
$entry = self::entry($doc, "text", $item, $owner, $item["entry:comment-allow"], $item["entry:cid"]); $entry = self::entry($doc, "text", $item, $owner, $item["entry:comment-allow"], $item["entry:cid"]);
if (isset($entry)) {
$root->appendChild($entry); $root->appendChild($entry);
} }
}
return trim($doc->saveXML()); return trim($doc->saveXML());
} }
@ -323,8 +325,10 @@ class DFRN
} }
$entry = self::entry($doc, $type, $item, $owner, true); $entry = self::entry($doc, $type, $item, $owner, true);
if (isset($entry)) {
$root->appendChild($entry); $root->appendChild($entry);
} }
}
$atom = trim($doc->saveXML()); $atom = trim($doc->saveXML());
@ -390,8 +394,10 @@ class DFRN
foreach ($items as $item) { foreach ($items as $item) {
$entry = self::entry($doc, $type, $item, $owner, true, 0); $entry = self::entry($doc, $type, $item, $owner, true, 0);
if (isset($entry)) {
$root->appendChild($entry); $root->appendChild($entry);
} }
}
} else { } else {
$root = self::entry($doc, $type, $item, $owner, true, 0, true); $root = self::entry($doc, $type, $item, $owner, true, 0, true);
} }
@ -916,7 +922,8 @@ class DFRN
$mentioned = []; $mentioned = [];
if (!$item['parent']) { if (!$item['parent']) {
return; Logger::notice('Item without parent found.', ['type' => $type, 'item' => $item]);
return null;
} }
if ($item['deleted']) { if ($item['deleted']) {