From 04a2dc075f23a5fafba1f1ce74e49ece98ea73e0 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Sat, 22 Dec 2018 20:08:44 +0100
Subject: manualy remove scale_external_images() due to merge conflicts

---
 include/text.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/text.php b/include/text.php
index 29daa74e8..5add633a2 100644
--- a/include/text.php
+++ b/include/text.php
@@ -3331,8 +3331,6 @@ function cleanup_bbcode($body) {
 
 	$body = preg_replace('/\[\/code\]\s*\[code\]/ism',"\n",$body);
 
-	$body = scale_external_images($body,false);
-
 	return $body;
 }
 
-- 
cgit v1.2.3