Merge pull request #2479 from annando/1604-vier-login

[friendica.git] / include / bbcode.php

diff --git a/include/bbcode.php b/include/bbcode.php
index b2c278013d1e01650231235efef2218406467aa4..70cd22d5f9c0eaa960c3aad0ac18a8f8e8f7a8e6 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -38,6 +38,11 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
        if (!$data)
                return $Text;
 
+       if (isset($data["title"])) {
+               $data["title"] = strip_tags($data["title"]);
+               $data["title"] = str_replace(array("http://", "https://"), "", $data["title"]);
+       }
+
        if (((strpos($data["text"], "[img=") !== false) OR (strpos($data["text"], "[img]") !== false)) AND ($data["image"] != "")) {
                $data["preview"] = $data["image"];
                $data["image"] = "";
@@ -94,17 +99,17 @@ function bb_remove_share_information($Text, $plaintext = false, $nolink = false)
                return $Text;
 
        if ($nolink)
-               return $data["text"];
+               return $data["text"].$data["after"];
 
        if ($plaintext)
                $data["title"] = $data["url"];
 
        if (($data["text"] == "") AND ($data["title"] != "") AND ($data["url"] == ""))
-               return $data["title"];
+               return $data["title"].$data["after"];
 
        // If the link already is included in the post, don't add it again
        if (($data["url"] != "") AND strpos($data["text"], $data["url"]))
-               return $data["text"];
+               return $data["text"].$data["after"];
 
        $text = $data["text"];
 
@@ -113,7 +118,7 @@ function bb_remove_share_information($Text, $plaintext = false, $nolink = false)
        elseif (($link != ""))
                $text .= "\n".$data["url"];
 
-       return $text;
+       return $text.$data["after"];
 }
 
 function bb_cleanstyle($st) {