diff options
| author | zotlabs <mike@macgirvin.com> | 2017-08-03 04:55:56 -0700 |
|---|---|---|
| committer | git-marijus <mario@mariovavti.com> | 2017-08-03 22:02:12 +0200 |
| commit | 913046aa28740f91d5aa16f0bfa8c764a7a24c03 (patch) | |
| tree | 786c63606c596c673b8b5c75c90314002c740799 /include | |
| parent | b4707705f15bda8c3bc4e21b7dd53ddcece69064 (diff) | |
| download | volse-hubzilla-913046aa28740f91d5aa16f0bfa8c764a7a24c03.tar.gz volse-hubzilla-913046aa28740f91d5aa16f0bfa8c764a7a24c03.tar.bz2 volse-hubzilla-913046aa28740f91d5aa16f0bfa8c764a7a24c03.zip | |
some bb-to-markdown issues
Diffstat (limited to 'include')
| -rw-r--r-- | include/markdown.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/markdown.php b/include/markdown.php index 530af57a0..0cd9ab237 100644 --- a/include/markdown.php +++ b/include/markdown.php @@ -157,11 +157,11 @@ function bb_to_markdown($Text, $options = []) { * Transform #tags, strip off the [url] and replace spaces with underscore */ - $Text = preg_replace_callback('/#\[([zu])rl\=(\w+.*?)\](\w+.*?)\[\/[(zu)]rl\]/i', + $Text = preg_replace_callback('/#\[([zu])rl\=(.*?)\](.*?)\[\/[(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); + $Text = preg_replace('/#\^\[([zu])rl\=(.*?)\](.*?)\[\/([zu])rl\]/i', '[$1rl=$2]$3[/$4rl]', $Text); // Converting images with size parameters to simple images. Markdown doesn't know it. $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text); @@ -197,9 +197,6 @@ function bb_to_markdown($Text, $options = []) { // Remove empty zrl links $Text = preg_replace("/\[zrl\=\].*?\[\/zrl\]/is", "", $Text); - // escape all unconverted tags - $Text = escape_tags($Text); - $Text = trim($Text); call_hooks('bb_to_markdown', $Text); |