diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-11-25 07:17:52 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-11-25 07:17:52 +0100 |
| commit | 2108173e74c12ce590c87e673d3455f7a9b18de8 (patch) | |
| tree | 2fc06a9de42ac30c95aab864ecfd0fe2e7681d0c /include/bbcode.php | |
| parent | b03545f89939ef1c13ca7f5a950d52fcb7f2313f (diff) | |
| parent | 08900b730bd39c00e399696472d904c1d5e4ef0b (diff) | |
| download | volse-hubzilla-2108173e74c12ce590c87e673d3455f7a9b18de8.tar.gz volse-hubzilla-2108173e74c12ce590c87e673d3455f7a9b18de8.tar.bz2 volse-hubzilla-2108173e74c12ce590c87e673d3455f7a9b18de8.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/bbcode.php')
| -rw-r--r-- | include/bbcode.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 7ebc8d37c..fd476766e 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -707,10 +707,12 @@ function parseIdentityAwareHTML($Text) { return $Text; } - // BBcode 2 HTML was written by WAY2WEB.net - // extended to work with Mistpark/Friendica/Redmatrix/Hubzilla - Mike Macgirvin -function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) { +function bbcode($Text, $options = []) { + + $preserve_nl = ((array_key_exists('preserve_nl',$options)) ? $options['preserve_nl'] : false); + $tryoembed = ((array_key_exists('tryomebed',$options)) ? $options['tryoembed'] : true); + $cache = ((array_key_exists('cache',$options)) ? $options['cache'] : false); call_hooks('bbcode_filter', $Text); |