diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-23 15:21:50 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-23 15:21:50 -0800 |
| commit | a99ebd42ec47ea531496f8ca5c07bf2868e21467 (patch) | |
| tree | ec417053a87c0e501cb93c70c8ad3adc07abd8b2 /include | |
| parent | 0cfe2ecd7bd77e2208e444350804682652686acc (diff) | |
| download | volse-hubzilla-a99ebd42ec47ea531496f8ca5c07bf2868e21467.tar.gz volse-hubzilla-a99ebd42ec47ea531496f8ca5c07bf2868e21467.tar.bz2 volse-hubzilla-a99ebd42ec47ea531496f8ca5c07bf2868e21467.zip | |
change to bbcode calling parameters: important: will require pulling addons;
also some extra checking of server headers in upload functions
Diffstat (limited to 'include')
| -rw-r--r-- | include/bbcode.php | 8 | ||||
| -rw-r--r-- | include/markdown.php | 2 | ||||
| -rw-r--r-- | include/text.php | 4 |
3 files changed, 8 insertions, 6 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); diff --git a/include/markdown.php b/include/markdown.php index f398d279e..e4a35e3c3 100644 --- a/include/markdown.php +++ b/include/markdown.php @@ -204,7 +204,7 @@ function bb_to_markdown($Text, $options = []) { $Text = $x['bbcode']; // Convert it to HTML - don't try oembed - $Text = bbcode($Text, $preserve_nl, false); + $Text = bbcode($Text, [ 'tryoembed' => false ]); // Markdownify does not preserve previously escaped html entities such as <> and &. $Text = str_replace(array('<','>','&'),array('&_lt_;','&_gt_;','&_amp_;'),$Text); diff --git a/include/text.php b/include/text.php index 343e3f00b..f3d522e04 100644 --- a/include/text.php +++ b/include/text.php @@ -1679,9 +1679,9 @@ function prepare_text($text, $content_type = 'text/bbcode', $cache = false) { require_once('include/bbcode.php'); if(stristr($text,'[nosmile]')) - $s = bbcode($text,false,true,$cache); + $s = bbcode($text, [ 'cache' => $cache ]); else - $s = smilies(bbcode($text,false,true,$cache)); + $s = smilies(bbcode($text, [ 'cache' => $cache ])); $s = zidify_links($s); |