From a7aaf7cc985be1664646aca3b3330405f85d9c4b Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 3 May 2016 20:12:13 +0200 Subject: [PATCH 1/2] Shared links to Diaspora should look better now --- include/bbcode.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 70cd22d5f9..62ee4da90c 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -101,7 +101,10 @@ function bb_remove_share_information($Text, $plaintext = false, $nolink = false) if ($nolink) 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"]; if (($data["text"] == "") AND ($data["title"] != "") AND ($data["url"] == "")) @@ -115,10 +118,10 @@ function bb_remove_share_information($Text, $plaintext = false, $nolink = false) if (($data["url"] != "") AND ($data["title"] != "")) $text .= "\n[url=".$data["url"]."]".$data["title"]."[/url]"; - elseif (($link != "")) + elseif (($data["url"] != "")) $text .= "\n".$data["url"]; - return $text.$data["after"]; + return $text."\n".$data["after"]; } function bb_cleanstyle($st) { From bed4799728dc3ef46340732b9a28e941c4d4208f Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 3 May 2016 21:57:08 +0200 Subject: [PATCH 2/2] Some more beautification. --- include/bbcode.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/bbcode.php b/include/bbcode.php index 62ee4da90c..c5c93ca64e 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -103,9 +103,12 @@ function bb_remove_share_information($Text, $plaintext = false, $nolink = false) $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"]; + elseif (strstr($title, $text)) { + $data["text"] = $data["title"]; + $data["title"] = $data["url"]; + } if (($data["text"] == "") AND ($data["title"] != "") AND ($data["url"] == "")) return $data["title"].$data["after"];