harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse Source
This commit is contained in:
zotlabs
2017-05-23 16:14:41 -07:00
parent 357e7af6ad 31d9208172
commit bf580fcc06
46 changed files with 2383 additions and 3362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/markdown.php
View File

@@ -5,7 +5,7 @@
*/
use Michelf\MarkdownExtra;
use Markdownify\Converter;
use League\HTMLToMarkdown\HtmlConverter;
require_once("include/oembed.php");
require_once("include/event.php");
@@ -177,10 +177,12 @@ function bb_to_markdown($Text) {
$Text = str_replace(array('<','>','&'),array('&_lt_;','&_gt_;','&_amp_;'),$Text);
// Now convert HTML to Markdown
$md = new Converter(Converter::LINK_AFTER_CONTENT, false, false);
$Text = $md->parseString($Text);
// The converter adds backslashes to our attempt at getting around the html entity preservation for some weird reason.
$md = new HtmlConverter();
$Text = $md->convert($Text);
// 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);