Merge branch 'dev' into perms

2016-07-18 16:10:41 -07:00
parent f9b67d3630 3beb94dc52
commit 7524948a97
1 changed files with 1 additions and 1 deletions
--- a/include/text.php
+++ b/include/text.php
@@ -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);