From 5cc6635eb81a8d76c04ee040a791f51ebbe389ef Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 8 Nov 2011 22:36:05 +0100
Subject: remove OC_Filesystem::fromUploadedFile

---
 files/ajax/upload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'files')

diff --git a/files/ajax/upload.php b/files/ajax/upload.php
index 041ec0c92e3..d9dafde7779 100644
--- a/files/ajax/upload.php
+++ b/files/ajax/upload.php
@@ -46,7 +46,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]);
 		}
 	}
-- 
cgit v1.2.3