diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-06-13 00:14:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-13 00:14:34 +0200 |
| commit | 01f8434a754d3822cf0bed4ad473a9a7aec7d623 (patch) | |
| tree | 5f6a3094ba23fdbc0b79cb1827e425ce99a0f497 /apps/files | |
| parent | ff0dda9412403a370f98504ae722d31b24682971 (diff) | |
| parent | ca43c49709e221a6ac7343163a36a21bf74ac2f7 (diff) | |
| download | nextcloud-server-01f8434a754d3822cf0bed4ad473a9a7aec7d623.tar.gz nextcloud-server-01f8434a754d3822cf0bed4ad473a9a7aec7d623.zip | |
Merge pull request #57 from nextcloud/fdrop-template
smaller files drop fixes
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/ajax/upload.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index 98066845734..d243b6ad97e 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -43,6 +43,7 @@ OCP\JSON::setContentTypeHeader('text/plain'); // If no token is sent along, rely on login only $errorCode = null; +$errorFileName = null; $l = \OC::$server->getL10N('files'); if (empty($_POST['dirToken'])) { @@ -225,6 +226,7 @@ if (\OC\Files\Filesystem::isValidPath($dir) === true) { } else { $error = $l->t('Upload failed. Could not find uploaded file'); + $errorFileName = $files['name'][$i]; } } catch(Exception $ex) { $error = $ex->getMessage(); @@ -272,5 +274,9 @@ if ($error === false) { } OCP\JSON::encodedPrint($result); } else { - OCP\JSON::error(array(array('data' => array_merge(array('message' => $error, 'code' => $errorCode), $storageStats)))); + OCP\JSON::error(array(array('data' => array_merge(array( + 'message' => $error, + 'code' => $errorCode, + 'filename' => $errorFileName + ), $storageStats)))); } |