diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-11-25 07:17:52 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-11-25 07:17:52 +0100 |
| commit | 2108173e74c12ce590c87e673d3455f7a9b18de8 (patch) | |
| tree | 2fc06a9de42ac30c95aab864ecfd0fe2e7681d0c /include/markdown.php | |
| parent | b03545f89939ef1c13ca7f5a950d52fcb7f2313f (diff) | |
| parent | 08900b730bd39c00e399696472d904c1d5e4ef0b (diff) | |
| download | volse-hubzilla-2108173e74c12ce590c87e673d3455f7a9b18de8.tar.gz volse-hubzilla-2108173e74c12ce590c87e673d3455f7a9b18de8.tar.bz2 volse-hubzilla-2108173e74c12ce590c87e673d3455f7a9b18de8.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/markdown.php')
| -rw-r--r-- | include/markdown.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/markdown.php b/include/markdown.php index f398d279e..e4a35e3c3 100644 --- a/include/markdown.php +++ b/include/markdown.php @@ -204,7 +204,7 @@ function bb_to_markdown($Text, $options = []) { $Text = $x['bbcode']; // Convert it to HTML - don't try oembed - $Text = bbcode($Text, $preserve_nl, false); + $Text = bbcode($Text, [ 'tryoembed' => false ]); // Markdownify does not preserve previously escaped html entities such as <> and &. $Text = str_replace(array('<','>','&'),array('&_lt_;','&_gt_;','&_amp_;'),$Text); |