aboutsummaryrefslogtreecommitdiffstats
path: root/include/photos.php
diff options
context:
space:
mode:
authorgit-marijus <mario@mariovavti.com>2017-11-04 10:22:58 +0100
committerGitHub <noreply@github.com>2017-11-04 10:22:58 +0100
commitcfbeb1655daba511f4843b8ba070a247e233fb29 (patch)
tree8ef7bf1e06a5d223228b370121bda97695af7d0e /include/photos.php
parent1a737be2b408135177a9e94dcffd0f68c0aca90b (diff)
parent39c194c5c32e49f461b8b42a3f4e411a3a5cde3c (diff)
downloadvolse-hubzilla-cfbeb1655daba511f4843b8ba070a247e233fb29.tar.gz
volse-hubzilla-cfbeb1655daba511f4843b8ba070a247e233fb29.tar.bz2
volse-hubzilla-cfbeb1655daba511f4843b8ba070a247e233fb29.zip
Merge branch 'dev' into docu
Diffstat (limited to 'include/photos.php')
-rw-r--r--include/photos.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/photos.php b/include/photos.php
index 508121950..c38e2bed4 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -74,6 +74,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']);