diff options
| author | git-marijus <mario@mariovavti.com> | 2017-07-31 02:47:24 +0200 |
|---|---|---|
| committer | git-marijus <mario@mariovavti.com> | 2017-07-31 02:47:24 +0200 |
| commit | 126e06b32ae7c442297173c38ad4fdda8473858d (patch) | |
| tree | a1ad76ebf44d406732141eed3ed97321a7463a62 /include/markdown.php | |
| parent | 988371be0b2df3f917da67f39814e21f96f9f957 (diff) | |
| parent | 964a02d68456912e08e76ec2bbfa1074e624cae7 (diff) | |
| download | volse-hubzilla-126e06b32ae7c442297173c38ad4fdda8473858d.tar.gz volse-hubzilla-126e06b32ae7c442297173c38ad4fdda8473858d.tar.bz2 volse-hubzilla-126e06b32ae7c442297173c38ad4fdda8473858d.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/markdown.php')
| -rw-r--r-- | include/markdown.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/markdown.php b/include/markdown.php index ccd108c1b..530af57a0 100644 --- a/include/markdown.php +++ b/include/markdown.php @@ -151,7 +151,7 @@ function bb_to_markdown_share($match) { -function bb_to_markdown($Text) { +function bb_to_markdown($Text, $options = []) { /* * Transform #tags, strip off the [url] and replace spaces with underscore @@ -168,9 +168,11 @@ function bb_to_markdown($Text) { $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism", 'bb_to_markdown_share', $Text); + $x = [ 'bbcode' => $Text, 'options' => $options ]; - call_hooks('bb_to_markdown_bb',$Text); + call_hooks('bb_to_markdown_bb',$x); + $Text = $x['bbcode']; // Convert it to HTML - don't try oembed $Text = bbcode($Text, $preserve_nl, false); |