aboutsummaryrefslogtreecommitdiffstats
path: root/include/bbcode.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-06-20 13:06:32 -0400
committerAndrew Manning <tamanning@zoho.com>2016-06-20 13:06:32 -0400
commitf4d9d34bbce463e09d45dce137c35ed531bc4ba1 (patch)
treea541fb28d557246ff6460287d4c0acb513d6a730 /include/bbcode.php
parente5f4d80bbe0c085a55f676aa1b05fb9bab1e4dc7 (diff)
parentcc09f9a7a5f799a0811ba83799c0a3ac6598c476 (diff)
downloadvolse-hubzilla-f4d9d34bbce463e09d45dce137c35ed531bc4ba1.tar.gz
volse-hubzilla-f4d9d34bbce463e09d45dce137c35ed531bc4ba1.tar.bz2
volse-hubzilla-f4d9d34bbce463e09d45dce137c35ed531bc4ba1.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
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];
}