aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-03-23 21:44:55 -0700
committerzotlabs <mike@macgirvin.com>2018-03-23 21:44:55 -0700
commita8d81a68d62e982094110a340341756fbb6df4a9 (patch)
tree51f310e1b99b5a8e87d8c349b44f73ea7c3ba6e0 /include
parentabe6ab477531916158c04e3d387cb02e839d28b6 (diff)
parent09567da292e4ff1eb89a781b685b26b2f9ba82b4 (diff)
downloadvolse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.tar.gz
volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.tar.bz2
volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include')
-rw-r--r--include/markdown.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/markdown.php b/include/markdown.php
index e4a35e3c3..431ba84a4 100644
--- a/include/markdown.php
+++ b/include/markdown.php
@@ -207,7 +207,7 @@ function bb_to_markdown($Text, $options = []) {
$Text = bbcode($Text, [ 'tryoembed' => false ]);
// Markdownify does not preserve previously escaped html entities such as <> and &.
- $Text = str_replace(array('&lt;','&gt;','&amp;'),array('&_lt_;','&_gt_;','&_amp_;'),$Text);
+ //$Text = str_replace(array('&lt;','&gt;','&amp;'),array('&_lt_;','&_gt_;','&_amp_;'),$Text);
// Now convert HTML to Markdown
@@ -215,7 +215,7 @@ function bb_to_markdown($Text, $options = []) {
// It also adds backslashes to our attempt at getting around the html entity preservation for some weird reason.
- $Text = str_replace(array('&\\_lt\\_;','&\\_gt\\_;','&\\_amp\\_;'),array('&lt;','&gt;','&amp;'),$Text);
+ //$Text = str_replace(array('&\\_lt\\_;','&\\_gt\\_;','&\\_amp\\_;'),array('&lt;','&gt;','&amp;'),$Text);
// If the text going into bbcode() has a plain URL in it, i.e.
// with no [url] tags around it, it will come out of parseString()