tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #1275 from annando/1501-hashtags-in-attachments

Browse source 
Titles in attached link description now don't create misformatted text anymore
This commit is contained in:
fabrixxm 2015-01-03 21:32:55 +01:00
parent 379b161bbb bf147ca9d9
commit 3195bacd9e
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/bbcode.php
View file

@ -41,7 +41,9 @@ function bb_attachment($Text, $plaintext = false, $tryoembed = true) {
if ($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 = "";
if ($type != "video") {
@ -1171,6 +1173,6 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
$a->save_timestamp($stamp1, "parser");
return $Text;
return trim($Text);
}
?>