Merge pull request #1275 from annando/1501-hashtags-in-attachments
Titles in attached link description now don't create misformatted text anymore
This commit is contained in:
commit
3195bacd9e
1 changed files with 4 additions and 2 deletions
|
@ -41,7 +41,9 @@ function bb_attachment($Text, $plaintext = false, $tryoembed = true) {
|
||||||
if ($matches[1] != "")
|
if ($matches[1] != "")
|
||||||
$title = $matches[1];
|
$title = $matches[1];
|
||||||
|
|
||||||
$title = htmlentities($title, ENT_QUOTES, 'UTF-8', false);
|
//$title = htmlentities($title, ENT_QUOTES, 'UTF-8', false);
|
||||||
|
$title = bbcode(html_entity_decode($title), false, false, true);
|
||||||
|
$title = str_replace(array("[", "]"), array("[", "]"), $title);
|
||||||
|
|
||||||
$image = "";
|
$image = "";
|
||||||
if ($type != "video") {
|
if ($type != "video") {
|
||||||
|
@ -1171,6 +1173,6 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
|
||||||
|
|
||||||
$a->save_timestamp($stamp1, "parser");
|
$a->save_timestamp($stamp1, "parser");
|
||||||
|
|
||||||
return $Text;
|
return trim($Text);
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
Loading…
Reference in a new issue