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

Merge pull request #8855 from annando/diaspora-plink 

Fix the plink for reshared Diaspora posts
This commit is contained in:
Hypolite Petovan 2020-07-09 15:32:50 -04:00 committed by GitHub
parent e683bd60ae 1f88bb8beb
commit 56b652eaeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Protocol/Diaspora.php
View File

@ -2603,7 +2603,7 @@ class Diaspora
// Do we already have this item?
$fields = ['body', 'title', 'attach', 'app', 'created', 'object-type', 'uri', 'guid',
'author-name', 'author-link', 'author-avatar'];
'author-name', 'author-link', 'author-avatar', 'plink'];
$condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => [Item::PUBLIC, Item::UNLISTED]];
$item = Item::selectFirst($fields, $condition);
@ -2647,7 +2647,7 @@ class Diaspora
if ($stored) {
$fields = ['body', 'title', 'attach', 'app', 'created', 'object-type', 'uri', 'guid',
'author-name', 'author-link', 'author-avatar'];
'author-name', 'author-link', 'author-avatar', 'plink'];
$condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => [Item::PUBLIC, Item::UNLISTED]];
$item = Item::selectFirst($fields, $condition);
@ -2749,8 +2749,6 @@ class Diaspora
return false;
}
$orig_url = DI::baseUrl()."/display/".$original_item["guid"];
$datarray = [];
$datarray["uid"] = $importer["uid"];
@ -2779,7 +2777,7 @@ class Diaspora
$original_item["author-name"],
$original_item["author-link"],
$original_item["author-avatar"],
$orig_url,
$original_item["plink"],
$original_item["created"],
$original_item["guid"]
);