aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-11-03 14:20:49 -0700
committerMario <mario@mariovavti.com>2017-11-03 23:09:31 +0100
commit6e48c365191e750941b5a9839ba9940242c9f313 (patch)
treeb5e8dff7ed64c1ac3b442dc2c84af5961a83715b
parentcf5beafcfd6287abaacadc2ae2f6ac196c4a7adc (diff)
downloadvolse-hubzilla-6e48c365191e750941b5a9839ba9940242c9f313.tar.gz
volse-hubzilla-6e48c365191e750941b5a9839ba9940242c9f313.tar.bz2
volse-hubzilla-6e48c365191e750941b5a9839ba9940242c9f313.zip
imagedata not set correctly if large photo AND imagick is not installed
-rw-r--r--include/photos.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/photos.php b/include/photos.php
index 5de68f162..503a725cd 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -75,6 +75,9 @@ function photo_upload($channel, $observer, $args) {
$imagedata = @file_get_contents($tmp_name);
@unlink($tmp_name);
}
+ else {
+ $imagedata = @file_get_contents($args['os_syspath']);
+ }
}
else {
$imagedata = @file_get_contents($args['os_syspath']);