aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/File_upload.php
diff options
context:
space:
mode:
authormjfriaza <mjfriaza@noreply.codeberg.org>2021-02-18 13:28:05 +0100
committermjfriaza <mjfriaza@noreply.codeberg.org>2021-02-18 13:28:05 +0100
commit655ae9d1cdaa940bb7861eb34f4f489a636879b2 (patch)
tree0a10c3d602f5da23dca56ac1360c3ee98282e079 /Zotlabs/Module/File_upload.php
parent76163fc37b76570e158ab32d53a1c0e0cc298bad (diff)
parent08c9152abdfa90da09931bdcc6e6c81ea243434c (diff)
downloadvolse-hubzilla-655ae9d1cdaa940bb7861eb34f4f489a636879b2.tar.gz
volse-hubzilla-655ae9d1cdaa940bb7861eb34f4f489a636879b2.tar.bz2
volse-hubzilla-655ae9d1cdaa940bb7861eb34f4f489a636879b2.zip
Merge branch 'dev' into dev
Diffstat (limited to 'Zotlabs/Module/File_upload.php')
-rw-r--r--Zotlabs/Module/File_upload.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/File_upload.php b/Zotlabs/Module/File_upload.php
index 6794dceee..e18067e20 100644
--- a/Zotlabs/Module/File_upload.php
+++ b/Zotlabs/Module/File_upload.php
@@ -64,7 +64,7 @@ class File_upload extends \Zotlabs\Web\Controller {
if($x['partial']) {
header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0));
- json_return_and_die($result);
+ json_return_and_die($x);
}
else {
header('Range: bytes=0-' . (($x['size']) ? $x['size'] - 1 : 0));