diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-25 14:08:15 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-25 14:08:15 -0800 |
| commit | 4471f580d7a50126d42690f05e81a75f7bbf8084 (patch) | |
| tree | 54e4fd3146a3978de744a39de6b7938d763852dd /include/markdown.php | |
| parent | e5141dd91bf483b0458b6f9226b994afbee23524 (diff) | |
| parent | e1fdac32782de11e443c7398ff3fb9870fa9b2d9 (diff) | |
| download | volse-hubzilla-4471f580d7a50126d42690f05e81a75f7bbf8084.tar.gz volse-hubzilla-4471f580d7a50126d42690f05e81a75f7bbf8084.tar.bz2 volse-hubzilla-4471f580d7a50126d42690f05e81a75f7bbf8084.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
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); |