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

Removed notice - pokes do now work mostly (#5693)

This commit is contained in:
Michael Vogel 2018-08-29 13:00:01 +00:00 committed by Hypolite Petovan
parent b524975e4f
commit 601851f3d0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/conversation.php
View File

@ -231,8 +231,9 @@ function localize_item(&$item)
$obj = XML::parseString($xmlhead.$item['object']); $obj = XML::parseString($xmlhead.$item['object']);
$Bname = $obj->title; $Bname = $obj->title;
$Blink = ""; $Blink = $obj->id;
$Bphoto = ""; $Bphoto = "";
foreach ($obj->link as $l) { foreach ($obj->link as $l) {
$atts = $l->attributes(); $atts = $l->attributes();
switch ($atts['rel']) { switch ($atts['rel']) {

5
src/Protocol/DFRN.php
View File

@ -2252,6 +2252,11 @@ class DFRN
if ($Blink && link_compare($Blink, System::baseUrl() . "/profile/" . $importer["nickname"])) { if ($Blink && link_compare($Blink, System::baseUrl() . "/profile/" . $importer["nickname"])) {
$author = DBA::selectFirst('contact', ['name', 'thumb', 'url'], ['id' => $item['author-id']]); $author = DBA::selectFirst('contact', ['name', 'thumb', 'url'], ['id' => $item['author-id']]);
$item['id'] = $posted_id;
$parent = Item::selectFirst(['id'], ['uri' => $item['parent-uri'], 'uid' => $importer["importer_uid"]]);
$item["parent"] = $parent['id'];
// send a notification // send a notification
notification( notification(
[ [