mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #2327 from annando/1602-dfrn-poke

Browse source 
DFRN: Sending pokes does work now again
This commit is contained in:
Tobias Diekershoff 2016-02-09 06:27:09 +01:00
parent 0c67c89715 981aad46d3
commit 7001a231e4
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
include/dfrn.php
View file

@ -634,13 +634,20 @@ class dfrn {
$r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link); $r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
$data = parse_xml_string($r->link, false); // XML does need a single element as root element so we add a dummy element here
foreach ($data->attributes() AS $parameter => $value) $data = parse_xml_string("<dummy>".$r->link."</dummy>", false);
$attributes[$parameter] = $value; if (is_object($data)) {
} else foreach ($data->link AS $link) {
$attributes = array();
foreach ($link->attributes() AS $parameter => $value)
$attributes[$parameter] = $value;
xml_add_element($doc, $entry, "link", "", $attributes);
}
}
} else {
$attributes = array("rel" => "alternate", "type" => "text/html", "href" => $r->link); $attributes = array("rel" => "alternate", "type" => "text/html", "href" => $r->link);
xml_add_element($doc, $entry, "link", "", $attributes);
xml_add_element($doc, $entry, "link", "", $attributes); }
} }
if($r->content) if($r->content)
xml_add_element($doc, $entry, "content", bbcode($r->content), array("type" => "html")); xml_add_element($doc, $entry, "content", bbcode($r->content), array("type" => "html"));
@ -1311,9 +1318,10 @@ class dfrn {
if (is_object($title)) if (is_object($title))
$obj_element->appendChild($obj_doc->importNode($title, true)); $obj_element->appendChild($obj_doc->importNode($title, true));
$link = $xpath->query("atom:link", $activity)->item(0); $links = $xpath->query("atom:link", $activity);
if (is_object($link)) if (is_object($links))
$obj_element->appendChild($obj_doc->importNode($link, true)); foreach ($links AS $link)
$obj_element->appendChild($obj_doc->importNode($link, true));
$content = $xpath->query("atom:content", $activity)->item(0); $content = $xpath->query("atom:content", $activity)->item(0);
if (is_object($content)) if (is_object($content))