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

Merge pull request #2505 from annando/1605-diaspora-reshare 

Diaspora: Reshares of non native reshares now look better
This commit is contained in:
Tobias Diekershoff 2016-05-06 09:45:49 +02:00
parent 480c35fb86 ea78f63eac
commit a1d06cc45e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/diaspora.php
View File

@ -4,9 +4,6 @@
* @brief The implementation of the diaspora protocol
*/
/// @todo reshare of some reshare doesn't work well, see guid c1d534b0ed19013358694860008dbc6c
// 14f571c0f244013358694860008dbc6c
require_once("include/items.php");
require_once("include/bb2diaspora.php");
require_once("include/Scrape.php");
@ -1913,8 +1910,13 @@ class diaspora {
FROM `item` WHERE `id` = %d AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
intval($item_id));
if ($r)
if ($r) {
// If it is a reshared post from another network then reformat to avoid display problems with two share elements
if (self::is_reshare($r[0]["body"], false))
$r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"]));
return $r[0];
}
}
}
@ -2548,7 +2550,7 @@ class diaspora {
// Skip if it isn't a pure repeated messages
// Does it start with a share?
if (strpos($body, "[share") > 0)
if ((strpos($body, "[share") > 0) AND $complete)
return(false);
// Does it end with a share?