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-30 18:18:28 -07:00
parent 893ae17b99 14229d0dd3
commit d3cad5a651
10 changed files with 580 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/markdown.php
View File

@@ -152,6 +152,7 @@ function markdown_to_bb($s, $use_zrl = false, $options = []) {
function bb_to_markdown($Text) {
/*
@@ -161,6 +162,7 @@ function bb_to_markdown($Text) {
$Text = preg_replace_callback('/#\[([zu])rl\=(\w+.*?)\](\w+.*?)\[\/[(zu)]rl\]/i',
create_function('$match', 'return \'#\'. str_replace(\' \', \'_\', $match[3]);'), $Text);
$Text = preg_replace('/#\^\[([zu])rl\=(\w+.*?)\](\w+.*?)\[\/([zu])rl\]/i', '[$1rl=$2]$3[/$4rl]', $Text);
// Converting images with size parameters to simple images. Markdown doesn't know it.
@@ -173,17 +175,14 @@ function bb_to_markdown($Text) {
$Text = bbcode($Text, $preserve_nl, false);
// Markdownify does not preserve previously escaped html entities such as <> and &.
$Text = str_replace(array('&lt;','&gt;','&amp;'),array('&_lt_;','&_gt_;','&_amp_;'),$Text);
// Now convert HTML to Markdown
$md = new HtmlConverter();
$Text = $md->convert($Text);
$Text = html2markdown($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('&lt;','&gt;','&amp;'),$Text);
// If the text going into bbcode() has a plain URL in it, i.e.
@@ -204,4 +203,4 @@ function bb_to_markdown($Text) {
return $Text;
}
}