diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-25 14:08:15 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-25 14:08:15 -0800 |
| commit | 4471f580d7a50126d42690f05e81a75f7bbf8084 (patch) | |
| tree | 54e4fd3146a3978de744a39de6b7938d763852dd /include/bbcode.php | |
| parent | e5141dd91bf483b0458b6f9226b994afbee23524 (diff) | |
| parent | e1fdac32782de11e443c7398ff3fb9870fa9b2d9 (diff) | |
| download | volse-hubzilla-4471f580d7a50126d42690f05e81a75f7bbf8084.tar.gz volse-hubzilla-4471f580d7a50126d42690f05e81a75f7bbf8084.tar.bz2 volse-hubzilla-4471f580d7a50126d42690f05e81a75f7bbf8084.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
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); |