diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-10-07 13:20:43 -0700 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-10-07 13:20:43 -0700 |
| commit | 2123ef57d830abe24684b54f9819b75ab780834e (patch) | |
| tree | 5a3e9f75f2046a13f58bf056491e1ab1921fabc3 /lib/private/connector/sabre/file.php | |
| parent | 6a93994a0111b06de75eeaea5cda7fe5e8ca3790 (diff) | |
| parent | f496609085448d69e882cf5e23caaa875ea0c60d (diff) | |
| download | nextcloud-server-2123ef57d830abe24684b54f9819b75ab780834e.tar.gz nextcloud-server-2123ef57d830abe24684b54f9819b75ab780834e.zip | |
Merge pull request #5181 from owncloud/fixing-chunked-upload-master
Fixing broken chunked upload due to #4974
Diffstat (limited to 'lib/private/connector/sabre/file.php')
| -rw-r--r-- | lib/private/connector/sabre/file.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php index 8ffec371e3f..12d7585884e 100644 --- a/lib/private/connector/sabre/file.php +++ b/lib/private/connector/sabre/file.php @@ -58,7 +58,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D // chunked handling if (isset($_SERVER['HTTP_OC_CHUNKED'])) { - list(, $name) = \Sabre_DAV_URLUtil::splitPath($this->path); + list($path, $name) = \Sabre_DAV_URLUtil::splitPath($this->path); $info = OC_FileChunking::decodeName($name); if (empty($info)) { @@ -67,7 +67,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D $chunk_handler = new OC_FileChunking($info); $chunk_handler->store($info['index'], $data); if ($chunk_handler->isComplete()) { - $newPath = $this->path . '/' . $info['name']; + $newPath = $path . '/' . $info['name']; $chunk_handler->file_assemble($newPath); return $this->getETagPropertyForPath($newPath); } |