aboutsummaryrefslogtreecommitdiffstats
path: root/include/bbcode.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-06-20 13:07:29 -0400
committerAndrew Manning <tamanning@zoho.com>2016-06-20 13:07:29 -0400
commit8cd9a1e4fc28d92d270e3f154c144123dca9044a (patch)
tree20e9d45895fdea5a1af3f4066a95c526e7476a20 /include/bbcode.php
parent20b4fc919871433df6111cbb8b3508fd1693123b (diff)
parentcc09f9a7a5f799a0811ba83799c0a3ac6598c476 (diff)
downloadvolse-hubzilla-8cd9a1e4fc28d92d270e3f154c144123dca9044a.tar.gz
volse-hubzilla-8cd9a1e4fc28d92d270e3f154c144123dca9044a.tar.bz2
volse-hubzilla-8cd9a1e4fc28d92d270e3f154c144123dca9044a.zip
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'include/bbcode.php')
-rw-r--r--include/bbcode.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index b720355af..0bf326506 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -493,7 +493,7 @@ function bb_code($match) {
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']))
+ 'vbscript','avrc','dtd','java','xml','cpp','python','javascript','js','json','sh']))
return text_highlight($match[2],strtolower($match[1]));
return $match[0];
}