diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-06 00:02:11 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-06 00:02:11 +0200 |
| commit | dad91c156fe63894b145530687ed5b9f84a3e571 (patch) | |
| tree | d1a3a67d429185dbc5597e8f485709757211cbc9 /apps/files | |
| parent | e159cbf527822edc28522df48b0526419835ca29 (diff) | |
| parent | bc1c77664205c8e044cf611a9339773a9f8af2c6 (diff) | |
| download | nextcloud-server-dad91c156fe63894b145530687ed5b9f84a3e571.tar.gz nextcloud-server-dad91c156fe63894b145530687ed5b9f84a3e571.zip | |
Merge branch 'master' into fixing-3942-master
Conflicts:
apps/files/ajax/upload.php
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/ajax/upload.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index 0a61ff72d41..dde5d3c50af 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -18,7 +18,6 @@ if (empty($_POST['dirToken'])) { } } else { $linkItem = OCP\Share::getShareByToken($_POST['dirToken']); - if ($linkItem === false) { OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Invalid Token'))))); die(); @@ -31,6 +30,7 @@ if (empty($_POST['dirToken'])) { $rootLinkItem = OCP\Share::resolveReShare($linkItem); // Setup FS with owner + OC_Util::tearDownFS(); OC_Util::setupFS($rootLinkItem['uid_owner']); // The token defines the target directory (security reasons) |