diff options
| -rw-r--r-- | Zotlabs/Module/Ochannel.php | 3 | ||||
| -rw-r--r-- | include/markdown.php | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Zotlabs/Module/Ochannel.php b/Zotlabs/Module/Ochannel.php index 3b187d2a6..508be1408 100644 --- a/Zotlabs/Module/Ochannel.php +++ b/Zotlabs/Module/Ochannel.php @@ -56,6 +56,9 @@ class Ochannel extends \Zotlabs\Web\Controller { function get($update = 0, $load = false) { + if(argc() < 2) + return; + if($load) $_SESSION['loadtime'] = datetime_convert(); 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('<','>','&'),array('&_lt_;','&_gt_;','&_amp_;'),$Text); + //$Text = str_replace(array('<','>','&'),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('<','>','&'),$Text); + //$Text = str_replace(array('&\\_lt\\_;','&\\_gt\\_;','&\\_amp\\_;'),array('<','>','&'),$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() |