Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-23 02:30:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reworked OStatus communication part to better support Mastodon.

Browse source
This commit is contained in:
Michael 2017-04-19 21:37:00 +00:00
parent 25d70c39c6
commit e16fb74b0c
5 changed files with 117 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/bbcode.php
View file

@ -59,11 +59,11 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
if (($data["title"] != "") AND ((strpos($test1,$test2) !== false) OR
(similar_text($test1,$test2) / strlen($data["title"])) > 0.9))
$title2 = $data["url"];
$text = sprintf('<a href="%s" title="%s" class="attachment thumbnail" rel="nofollow external">%s</a><br />',
$text = sprintf('<a href="%s" title="%s" class="attachment" rel="nofollow external">%s</a><br />',
$data["url"], $data["title"], $title2);
} elseif (($simplehtml != 4) AND ($simplehtml != 0))
} elseif (($simplehtml != 4) AND ($simplehtml != 0)) {
$text = sprintf('<a href="%s" target="_blank">%s</a><br>', $data["url"], $data["title"]);
else {
} else {
$text = sprintf('<span class="type-%s">', $data["type"]);
$bookmark = array(sprintf('[bookmark=%s]%s[/bookmark]', $data["url"], $data["title"]), $data["url"], $data["title"]);
@ -89,7 +89,7 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
$text .= sprintf('<blockquote>%s</blockquote></span>', trim(bbcode($data["description"])));
}
}
return $data["text"].$text.$data["after"];
return trim($data["text"].' '.$text.' '.$data["after"]);
}
function bb_remove_share_information($Text, $plaintext = false, $nolink = false) {