friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #6749 from nupplaphil/6386-php_fatal 

Fixing appending child at DFRN without a parent id.
This commit is contained in:
Hypolite Petovan 2019-02-24 12:55:34 -05:00 committed by GitHub
parent 8adc761da0 5d13b94761
commit 458064ddde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Protocol/DFRN.php
View File

@ -119,7 +119,9 @@ 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"]);
$root->appendChild($entry); if (isset($entry)) {
$root->appendChild($entry);
}
} }
return trim($doc->saveXML()); return trim($doc->saveXML());
@ -323,7 +325,9 @@ class DFRN
} }
$entry = self::entry($doc, $type, $item, $owner, true); $entry = self::entry($doc, $type, $item, $owner, true);
$root->appendChild($entry); if (isset($entry)) {
$root->appendChild($entry);
}
} }
$atom = trim($doc->saveXML()); $atom = trim($doc->saveXML());
@ -390,7 +394,9 @@ 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);
$root->appendChild($entry); if (isset($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);
@ -906,7 +912,7 @@ class DFRN
* @param int $cid Contact ID of the recipient * @param int $cid Contact ID of the recipient
* @param bool $single If set, the entry is created as an XML document with a single "entry" element * @param bool $single If set, the entry is created as an XML document with a single "entry" element
* *
* @return \DOMElement XML entry object * @return null|\DOMElement XML entry object
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
* @todo Find proper type-hints * @todo Find proper type-hints
@ -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']) {