Merge branch 'origin' into 'develop'

merge upstream/master for 3.8.8 See merge request harukin/core!30
2018-12-24 00:54:15 +09:00
parent 140af45bb0 414b7e28d3
commit ffadb70d81
16 changed files with 98 additions and 132 deletions
--- a/include/text.php
+++ b/include/text.php
@@ -3339,8 +3339,6 @@ function cleanup_bbcode($body) {

 	$body = preg_replace('/\[\/code\]\s*\[code\]/ism',"\n",$body);

-	$body = scale_external_images($body,false);
-
 	return $body;
 }