summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2016-10-25 10:31:03 +0200
committerGitHub <noreply@github.com>2016-10-25 10:31:03 +0200
commit79706e0ddc6ab970d5709e89b8d0caec4d34662b (patch)
tree168f9bc806e7eed287bce63e7f6d277eb5adb956 /lib
parent5926da3dd6535e0eea7fe7871d2347f8b33bb337 (diff)
parentc8a13f644ebbc5840d0e632cf86e5ae46856f7f0 (diff)
downloadnextcloud-server-79706e0ddc6ab970d5709e89b8d0caec4d34662b.tar.gz
nextcloud-server-79706e0ddc6ab970d5709e89b8d0caec4d34662b.zip
Merge pull request #1283 from nextcloud/us_files-ui-webdav-upload
Use Webdav PUT for uploads
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Files/Storage/Wrapper/PermissionsMask.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/private/Files/Storage/Wrapper/PermissionsMask.php b/lib/private/Files/Storage/Wrapper/PermissionsMask.php
index 39375602c34..7bcb1087fef 100644
--- a/lib/private/Files/Storage/Wrapper/PermissionsMask.php
+++ b/lib/private/Files/Storage/Wrapper/PermissionsMask.php
@@ -78,6 +78,14 @@ class PermissionsMask extends Wrapper {
}
public function rename($path1, $path2) {
+ $p = strpos($path1, $path2);
+ if ($p === 0) {
+ $part = substr($path1, strlen($path2));
+ //This is a rename of the transfer file to the original file
+ if (strpos($part, '.ocTransferId') === 0) {
+ return $this->checkMask(Constants::PERMISSION_CREATE) and parent::rename($path1, $path2);
+ }
+ }
return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::rename($path1, $path2);
}