diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-02-08 15:50:58 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-02-08 15:50:58 +0100 |
| commit | 5f7727629ad86dfb91c0f27c8f59eb97c100a95d (patch) | |
| tree | 3806b5ffc2ccf5c432d4a4c0f951837971a4b100 /files/ajax/upload.php | |
| parent | cdf1cf82baef9764b3211017e7c3e63fb10676d3 (diff) | |
| parent | e50dfbc2284e170b37735880d0a8694b89234400 (diff) | |
| download | nextcloud-server-5f7727629ad86dfb91c0f27c8f59eb97c100a95d.tar.gz nextcloud-server-5f7727629ad86dfb91c0f27c8f59eb97c100a95d.zip | |
Merge branch 'filesystem'
Diffstat (limited to 'files/ajax/upload.php')
| -rw-r--r-- | files/ajax/upload.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/files/ajax/upload.php b/files/ajax/upload.php index 5f0f68d9531..241edc216ff 100644 --- a/files/ajax/upload.php +++ b/files/ajax/upload.php @@ -47,7 +47,7 @@ if(strpos($dir,'..') === false){ $fileCount=count($files['name']); for($i=0;$i<$fileCount;$i++){ $target=stripslashes($dir) . $files['name'][$i]; - if(OC_Filesystem::fromUploadedFile($files['tmp_name'][$i],$target)){ + if(is_uploaded_file($files['tmp_name'][$i]) and OC_Filesystem::fromTmpFile($files['tmp_name'][$i],$target)){ $result[]=array( "status" => "success", 'mime'=>OC_Filesystem::getMimeType($target),'size'=>OC_Filesystem::filesize($target),'name'=>$files['name'][$i]); } } |