Merge branch 'dev' into perms

This commit is contained in:
redmatrix 2016-07-18 16:10:41 -07:00
commit 7524948a97

View File

@ -687,7 +687,7 @@ function get_tags($s) {
// ignore anything in a code block
$s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s);
$s = preg_replace('/\[code(.*?)\](.*?)\[\/code\]/sm','',$s);
// ignore anything in [style= ]
$s = preg_replace('/\[style=(.*?)\]/sm','',$s);