diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-16 19:45:02 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-16 19:45:02 -0400 |
| commit | e5f4d80bbe0c085a55f676aa1b05fb9bab1e4dc7 (patch) | |
| tree | 3b46494707be3560c855e1b1a4cdcd329f7fa570 /include/bbcode.php | |
| parent | f2dda646ecf1d11bf88c085d1174d3c147f799b1 (diff) | |
| parent | aa77b04860a68370d829f1081418e69777d0e1f9 (diff) | |
| download | volse-hubzilla-e5f4d80bbe0c085a55f676aa1b05fb9bab1e4dc7.tar.gz volse-hubzilla-e5f4d80bbe0c085a55f676aa1b05fb9bab1e4dc7.tar.bz2 volse-hubzilla-e5f4d80bbe0c085a55f676aa1b05fb9bab1e4dc7.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'include/bbcode.php')
| -rw-r--r-- | include/bbcode.php | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 63a475779..b720355af 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -491,6 +491,12 @@ function bb_code($match) { return '<code class="inline-code">' . trim($match[1]) . '</code>'; } +function bb_highlight($match) { + if(in_array(strtolower($match[1]),['php','css','mysql','sql','abap','diff','html','perl','ruby', + 'vbscript','avrc','dtd','java','xml','cpp','python','javascript','js','sh'])) + return text_highlight($match[2],strtolower($match[1])); + return $match[0]; +} // BBcode 2 HTML was written by WAY2WEB.net @@ -566,6 +572,15 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) $Text = str_replace(">", ">", $Text); + // Check for [code] text here, before the linefeeds are messed with. + // The highlighter will unescape and re-escape the content. + + if (strpos($Text,'[code=') !== false) { + $Text = preg_replace_callback("/\[code=(.*?)\](.*?)\[\/code\]/ism", 'bb_highlight', $Text); + } + + + // Convert new line chars to html <br /> tags // nlbr seems to be hopelessly messed up |