diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-01-07 00:16:10 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-01-07 00:16:10 +0100 |
| commit | e8d08d4930fae31a665c679b5ac1a147859eb099 (patch) | |
| tree | 426671882f753d0fea8f80c786bdd6892d57cdb5 /apps/files/ajax/upload.php | |
| parent | 1137723b2a46c37d61e7f501694c73562b21ef74 (diff) | |
| parent | 0b007235b99fa8d66cdb8ca917fe2f45dd8e4edc (diff) | |
| download | nextcloud-server-e8d08d4930fae31a665c679b5ac1a147859eb099.tar.gz nextcloud-server-e8d08d4930fae31a665c679b5ac1a147859eb099.zip | |
merge master into filesystem
Diffstat (limited to 'apps/files/ajax/upload.php')
| -rw-r--r-- | apps/files/ajax/upload.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index b6ae69f1e30..eea66d6b269 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -52,8 +52,8 @@ if(strpos($dir, '..') === false) { for($i=0;$i<$fileCount;$i++) { $target = OCP\Files::buildNotExistingFileName(stripslashes($dir), $files['name'][$i]); // $path needs to be normalized - this failed within drag'n'drop upload to a sub-folder - $target = OC_Filesystem::normalizePath($target); - if(is_uploaded_file($files['tmp_name'][$i]) and OC_Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) { + $target = \OC\Files\Filesystem::normalizePath($target); + if(is_uploaded_file($files['tmp_name'][$i]) and \OC\Files\Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) { $meta = \OC\Files\Filesystem::getFileInfo($target); $result[]=array( 'status' => 'success', 'mime'=>$meta['mimetype'], |