Merge pull request #1422 from TheSFReader/master

Correct the Cache Scanner so that it doesn't try and scan subdirs of a non-dir path when renaming 

1 files changed, 2 insertions, 1 deletions

diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 9ecc1a6c2f4..676612c0e42 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -10,6 +10,8 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 $l = OC_L10N::get('files');
 
+
+$dir = $_POST['dir'];
 // get array with current storage stats (e.g. max file size)
 $storageStats = \OCA\files\lib\Helper::buildFileStorageStatistics($dir);
 
@@ -37,7 +39,6 @@ foreach ($_FILES['files']['error'] as $error) {
 }
 $files = $_FILES['files'];
 
-$dir = $_POST['dir'];
 $error = '';
 
 $maxUploadFilesize = OCP\Util::maxUploadFilesize($dir);