Merge pull request #5181 from owncloud/fixing-chunked-upload-master

Fixing broken chunked upload due to #4974
This commit is contained in:
Morris Jobke 2013-10-07 13:20:43 -07:00
commit 2123ef57d8
1 changed files with 2 additions and 2 deletions

View File

@ -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);
}