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

DFRN comments are now stored as comments again

This commit is contained in:
Michael 2019-01-24 18:54:45 +00:00
parent 99199ee93b
commit ebb84f5e43
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Protocol/DFRN.php
View File

@ -2512,8 +2512,8 @@ class DFRN
} }
$notice_info = $xpath->query("statusnet:notice_info", $entry); $notice_info = $xpath->query("statusnet:notice_info", $entry);
if ($notice_info && ($notice_info->length > 0) && !empty($notice_info->item)) { if ($notice_info && ($notice_info->length > 0)) {
foreach ($notice_info->item[0]->attributes as $attributes) { foreach ($notice_info->item(0)->attributes as $attributes) {
if ($attributes->name == "source") { if ($attributes->name == "source") {
$item["app"] = strip_tags($attributes->textContent); $item["app"] = strip_tags($attributes->textContent);
} }
@ -2588,8 +2588,8 @@ class DFRN
$item['conversation-uri'] = XML::getFirstNodeValue($xpath, 'ostatus:conversation/text()', $entry); $item['conversation-uri'] = XML::getFirstNodeValue($xpath, 'ostatus:conversation/text()', $entry);
$conv = $xpath->query('ostatus:conversation', $entry); $conv = $xpath->query('ostatus:conversation', $entry);
if (!empty($conv->item[0])) { if (is_object($conv->item(0))) {
foreach ($conv->item[0]->attributes as $attributes) { foreach ($conv->item(0)->attributes as $attributes) {
if ($attributes->name == "ref") { if ($attributes->name == "ref") {
$item['conversation-uri'] = $attributes->textContent; $item['conversation-uri'] = $attributes->textContent;
} }
@ -2603,8 +2603,8 @@ class DFRN
$item["parent-uri"] = $item["uri"]; $item["parent-uri"] = $item["uri"];
$inreplyto = $xpath->query("thr:in-reply-to", $entry); $inreplyto = $xpath->query("thr:in-reply-to", $entry);
if (!empty($inreplyto->item[0])) { if (is_object($inreplyto->item(0))) {
foreach ($inreplyto->item[0]->attributes as $attributes) { foreach ($inreplyto->item(0)->attributes as $attributes) {
if ($attributes->name == "ref") { if ($attributes->name == "ref") {
$item["parent-uri"] = $attributes->textContent; $item["parent-uri"] = $attributes->textContent;
} }

2
src/Protocol/OStatus.php
View File

@ -72,7 +72,7 @@ class OStatus
} }
$author["author-id"] = Contact::getIdForURL($author["author-link"]); $author["author-id"] = Contact::getIdForURL($author["author-link"]);
$author["contact-id"] = $contact["id"]; $author['contact-id'] = defaults($contact, 'id', $author['author-id']);
$contact = []; $contact = [];