diff options
| author | git-marijus <mario@mariovavti.com> | 2017-08-03 21:59:46 +0200 |
|---|---|---|
| committer | git-marijus <mario@mariovavti.com> | 2017-08-03 21:59:46 +0200 |
| commit | a618f70f56efdcaaf9da6dcfcab9cce6a933303b (patch) | |
| tree | d363935c303b53f4b82a15b523259c53bb3cd2a6 /include/markdown.php | |
| parent | 9566eab934f0a13a892af7b70a79429949a01c3f (diff) | |
| parent | d06ce6294d8bbf6bed668e7f0f363fcad63f4e05 (diff) | |
| download | volse-hubzilla-a618f70f56efdcaaf9da6dcfcab9cce6a933303b.tar.gz volse-hubzilla-a618f70f56efdcaaf9da6dcfcab9cce6a933303b.tar.bz2 volse-hubzilla-a618f70f56efdcaaf9da6dcfcab9cce6a933303b.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/markdown.php')
| -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); |