aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2018-12-22 20:08:44 +0100
committerMario <mario@mariovavti.com>2018-12-22 20:08:44 +0100
commit04a2dc075f23a5fafba1f1ce74e49ece98ea73e0 (patch)
tree4e7218648cc345675ff1536d6f306a2b611f9f5d
parent01448c152c95bdb90b429710498d034f127983d1 (diff)
downloadvolse-hubzilla-04a2dc075f23a5fafba1f1ce74e49ece98ea73e0.tar.gz
volse-hubzilla-04a2dc075f23a5fafba1f1ce74e49ece98ea73e0.tar.bz2
volse-hubzilla-04a2dc075f23a5fafba1f1ce74e49ece98ea73e0.zip
manualy remove scale_external_images() due to merge conflicts
-rw-r--r--include/text.php2
1 files changed, 0 insertions, 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;
}