aboutsummaryrefslogtreecommitdiffstats
path: root/include/bbcode.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-06-18 11:10:40 +0200
committerMario Vavti <mario@mariovavti.com>2016-06-18 11:10:40 +0200
commit178b440f05ff7356f313845fbfb307a838a29f8d (patch)
tree67e8385f1bac27c3d19fb0fd569c88dc266647df /include/bbcode.php
parent9749bbcedcb0aa20330790ca7af838d00de45f05 (diff)
parent755dd67ec7856b8926bfb78e6034ddff1834b032 (diff)
downloadvolse-hubzilla-178b440f05ff7356f313845fbfb307a838a29f8d.tar.gz
volse-hubzilla-178b440f05ff7356f313845fbfb307a838a29f8d.tar.bz2
volse-hubzilla-178b440f05ff7356f313845fbfb307a838a29f8d.zip
Merge branch 'dev' into sabre32
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];
}