summaryrefslogtreecommitdiffstats
path: root/apps/files/ajax
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-01-12 17:48:12 +0100
committerMorris Jobke <hey@morrisjobke.de>2015-01-12 17:48:12 +0100
commit2a0356862322d024c7488c74c8c07697143a6a9e (patch)
tree80483cf0f1c69d5748c7f3a1fab9ce56e9eeb148 /apps/files/ajax
parentaf4d60adb0ab96f6af1d83003a1ee49230ada51e (diff)
parent6daedaf344b33c2c7b031f00117e4235d30f226f (diff)
downloadnextcloud-server-2a0356862322d024c7488c74c8c07697143a6a9e.tar.gz
nextcloud-server-2a0356862322d024c7488c74c8c07697143a6a9e.zip
Merge pull request #13279 from owncloud/upload-original-name
Send the proper original name for uploaded files
Diffstat (limited to 'apps/files/ajax')
-rw-r--r--apps/files/ajax/upload.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index fcee0166da6..7bf6c40e87c 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -168,7 +168,7 @@ if (strpos($dir, '..') === false) {
} else {
$data = \OCA\Files\Helper::formatFileInfo($meta);
$data['status'] = 'success';
- $data['originalname'] = $files['tmp_name'][$i];
+ $data['originalname'] = $files['name'][$i];
$data['uploadMaxFilesize'] = $maxUploadFileSize;
$data['maxHumanFilesize'] = $maxHumanFileSize;
$data['permissions'] = $meta['permissions'] & $allowedPermissions;
@@ -195,7 +195,7 @@ if (strpos($dir, '..') === false) {
} else {
$data['status'] = 'readonly';
}
- $data['originalname'] = $files['tmp_name'][$i];
+ $data['originalname'] = $files['name'][$i];
$data['uploadMaxFilesize'] = $maxUploadFileSize;
$data['maxHumanFilesize'] = $maxHumanFileSize;
$data['permissions'] = $meta['permissions'] & $allowedPermissions;