diff options
| author | Robin <robin@Amaya.(none)> | 2010-04-28 12:01:05 +0200 |
|---|---|---|
| committer | Robin <robin@Amaya.(none)> | 2010-04-28 12:01:05 +0200 |
| commit | fb498b9534b545c0e66cb82304e64f199c77a463 (patch) | |
| tree | 5dee29e558a580fe57d777aa41b493671b0f5a3b /files/upload.php | |
| parent | 09add452d93f185d89ab51b67cda2fc384772db5 (diff) | |
| parent | 854e0c5a9c9060e827fbbfddffeeeadfc2d27278 (diff) | |
| download | nextcloud-server-fb498b9534b545c0e66cb82304e64f199c77a463.tar.gz nextcloud-server-fb498b9534b545c0e66cb82304e64f199c77a463.zip | |
fix merge conflicts
Diffstat (limited to 'files/upload.php')
| -rw-r--r-- | files/upload.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/files/upload.php b/files/upload.php index b5fed2ed5b1..0aa435cad6f 100644 --- a/files/upload.php +++ b/files/upload.php @@ -22,6 +22,8 @@ */ require_once('../inc/lib_base.php'); +// sleep(5); //immitate slow internet. + $fileName=$_FILES['file']['name']; $source=$_FILES['file']['tmp_name']; $target=$CONFIG_DATADIRECTORY.'/'.$_GET['dir'].'/'.$fileName; |