diff options
| author | Max Kostikov <max@kostikov.co> | 2021-01-20 13:15:40 +0100 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2021-01-20 13:15:40 +0100 |
| commit | 9612a69a6448331ae3296503e97ef6ce204d9be1 (patch) | |
| tree | afae1ea1fa8c63db4c23836e0ebfe57b56b808ec /Zotlabs/Module/File_upload.php | |
| parent | 308e94ea799b7851287fbc7635480ac13bfe3c61 (diff) | |
| parent | 08264f8d11d349bbda92233d984ad52c16c6b2d6 (diff) | |
| download | volse-hubzilla-9612a69a6448331ae3296503e97ef6ce204d9be1.tar.gz volse-hubzilla-9612a69a6448331ae3296503e97ef6ce204d9be1.tar.bz2 volse-hubzilla-9612a69a6448331ae3296503e97ef6ce204d9be1.zip | |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!1
Diffstat (limited to 'Zotlabs/Module/File_upload.php')
| -rw-r--r-- | Zotlabs/Module/File_upload.php | 2 |
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)); |