Merge pull request #2466 from annando/1604-remove-attachment
Bugfix: The function to remove parts of attachments forgot the rest
This commit is contained in:
commit
1dd73dce80
1 changed files with 4 additions and 4 deletions
|
@ -94,17 +94,17 @@ function bb_remove_share_information($Text, $plaintext = false, $nolink = false)
|
||||||
return $Text;
|
return $Text;
|
||||||
|
|
||||||
if ($nolink)
|
if ($nolink)
|
||||||
return $data["text"];
|
return $data["text"].$data["after"];
|
||||||
|
|
||||||
if ($plaintext)
|
if ($plaintext)
|
||||||
$data["title"] = $data["url"];
|
$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"];
|
return $data["title"].$data["after"];
|
||||||
|
|
||||||
// If the link already is included in the post, don't add it again
|
// If the link already is included in the post, don't add it again
|
||||||
if (($data["url"] != "") AND strpos($data["text"], $data["url"]))
|
if (($data["url"] != "") AND strpos($data["text"], $data["url"]))
|
||||||
return $data["text"];
|
return $data["text"].$data["after"];
|
||||||
|
|
||||||
$text = $data["text"];
|
$text = $data["text"];
|
||||||
|
|
||||||
|
@ -113,7 +113,7 @@ function bb_remove_share_information($Text, $plaintext = false, $nolink = false)
|
||||||
elseif (($link != ""))
|
elseif (($link != ""))
|
||||||
$text .= "\n".$data["url"];
|
$text .= "\n".$data["url"];
|
||||||
|
|
||||||
return $text;
|
return $text.$data["after"];
|
||||||
}
|
}
|
||||||
|
|
||||||
function bb_cleanstyle($st) {
|
function bb_cleanstyle($st) {
|
||||||
|
|
Loading…
Reference in a new issue