Merge remote-tracking branch 'upstream/dev' into website-import

2016-07-20 05:38:19 -04:00
parent 0c7ad924a8 9421e42dad
commit 99f7dd0fd4
9 changed files with 52 additions and 15 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);