jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2502 from annando/1605-diaspora-share

Browse source 
Shared links to Diaspora should look better now
This commit is contained in:
Tobias Diekershoff 2016-05-04 07:20:22 +02:00
commit 167a8998d6
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/bbcode.php
View file

@ -101,8 +101,14 @@ function bb_remove_share_information($Text, $plaintext = false, $nolink = false)
if ($nolink) if ($nolink)
return $data["text"].$data["after"]; return $data["text"].$data["after"];
if ($plaintext) $title = htmlentities($data["title"], ENT_QUOTES, 'UTF-8', false);
$text = htmlentities($data["text"], ENT_QUOTES, 'UTF-8', false);
if ($plaintext or strstr($text, $title))
$data["title"] = $data["url"]; $data["title"] = $data["url"];
elseif (strstr($title, $text)) {
$data["text"] = $data["title"];
$data["title"] = $data["url"];
}
if (($data["text"] == "") AND ($data["title"] != "") AND ($data["url"] == "")) if (($data["text"] == "") AND ($data["title"] != "") AND ($data["url"] == ""))
return $data["title"].$data["after"]; return $data["title"].$data["after"];
@ -115,10 +121,10 @@ function bb_remove_share_information($Text, $plaintext = false, $nolink = false)
if (($data["url"] != "") AND ($data["title"] != "")) if (($data["url"] != "") AND ($data["title"] != ""))
$text .= "\n[url=".$data["url"]."]".$data["title"]."[/url]"; $text .= "\n[url=".$data["url"]."]".$data["title"]."[/url]";
elseif (($link != "")) elseif (($data["url"] != ""))
$text .= "\n".$data["url"]; $text .= "\n".$data["url"];
return $text.$data["after"]; return $text."\n".$data["after"];
} }
function bb_cleanstyle($st) { function bb_cleanstyle($st) {