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

Reshares had been detected falsely so that were rejected by Diaspora

This commit is contained in:
Michael 2018-05-03 13:03:41 +00:00
parent aba93df94f
commit 53b7028d35
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Content/Text/BBCode.php
View File

@ -965,7 +965,7 @@ class BBCode extends BaseObject
} }
if (stripos(normalise_link($link), 'http://twitter.com/') === 0) { if (stripos(normalise_link($link), 'http://twitter.com/') === 0) {
$text .= '<br /><a href="' . $link . '" title="' . $link . '">' . $link . '</a>'; $text .= '<br /><a href="' . $link . '">' . $link . '</a>';
} else { } else {
$text .= $headline . '<blockquote>' . trim($share[3]) . "</blockquote><br />"; $text .= $headline . '<blockquote>' . trim($share[3]) . "</blockquote><br />";

8
src/Protocol/Diaspora.php
View File

@ -3571,8 +3571,12 @@ class Diaspora
$ret["root_guid"] = $guid; $ret["root_guid"] = $guid;
return $ret; return $ret;
} }
} elseif (($guid == "") && $complete) {
return false;
} }
$ret["root_guid"] = $guid;
$profile = ""; $profile = "";
preg_match("/profile='(.*?)'/ism", $attributes, $matches); preg_match("/profile='(.*?)'/ism", $attributes, $matches);
if ($matches[1] != "") { if ($matches[1] != "") {
@ -3593,10 +3597,6 @@ class Diaspora
} }
} }
if (!empty($guid)) {
$ret["root_guid"] = $guid;
}
if (empty($ret) && !$complete) { if (empty($ret) && !$complete) {
return true; return true;
} }