diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-03 19:18:35 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-03 19:18:35 -0700 |
| commit | 1d903655afdd8e49942c6d6c9ca1a7feadeaaa82 (patch) | |
| tree | 892c93a0a3e434b6e8ff8c04d3d7107cf1e12750 /include/photos.php | |
| parent | 0403738981487b7edec20b11a85849254366a202 (diff) | |
| parent | a899ce1c22386b9ff882048cba35d46f560ee654 (diff) | |
| download | volse-hubzilla-1d903655afdd8e49942c6d6c9ca1a7feadeaaa82.tar.gz volse-hubzilla-1d903655afdd8e49942c6d6c9ca1a7feadeaaa82.tar.bz2 volse-hubzilla-1d903655afdd8e49942c6d6c9ca1a7feadeaaa82.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/photos.php')
| -rw-r--r-- | include/photos.php | 3 |
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']); |