diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-08-24 17:22:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-24 17:22:56 +0200 |
| commit | d8e876c0da664bf358400806497c86bed3206570 (patch) | |
| tree | b05e950b631b24d800d41f334ac02924d0cb012d /apps/workflowengine | |
| parent | e8817ed3ea3a1bd74945029b01664abf37d3911e (diff) | |
| parent | c5742124220518908ccc4bce1fd3179909aaf2b9 (diff) | |
| download | nextcloud-server-d8e876c0da664bf358400806497c86bed3206570.tar.gz nextcloud-server-d8e876c0da664bf358400806497c86bed3206570.zip | |
Merge pull request #10828 from nextcloud/bugfix/fac-108/mimetype-detection-broken-for-junked-uploads
Fix mimetype detection for junked uploads
Diffstat (limited to 'apps/workflowengine')
| -rw-r--r-- | apps/workflowengine/lib/Check/FileMimeType.php | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/apps/workflowengine/lib/Check/FileMimeType.php b/apps/workflowengine/lib/Check/FileMimeType.php index fe4a83bb906..bd94ec9d5bc 100644 --- a/apps/workflowengine/lib/Check/FileMimeType.php +++ b/apps/workflowengine/lib/Check/FileMimeType.php @@ -83,9 +83,13 @@ class FileMimeType extends AbstractStringCheck { return $this->mimeType[$this->storage->getId()][$this->path]; } - if ($this->request->getMethod() === 'PUT') { - $path = $this->request->getPathInfo(); - $this->mimeType[$this->storage->getId()][$this->path] = $this->mimeTypeDetector->detectPath($path); + if ($this->request->getMethod() === 'PUT' || $this->request->getMethod() === 'MOVE') { + if ($this->request->getMethod() === 'MOVE') { + $this->mimeType[$this->storage->getId()][$this->path] = $this->mimeTypeDetector->detectPath($this->path); + } else { + $path = $this->request->getPathInfo(); + $this->mimeType[$this->storage->getId()][$this->path] = $this->mimeTypeDetector->detectPath($path); + } return $this->mimeType[$this->storage->getId()][$this->path]; } } else if ($this->isPublicWebDAVRequest()) { @@ -171,7 +175,9 @@ class FileMimeType extends AbstractStringCheck { $this->request->getPathInfo() === '/webdav' || strpos($this->request->getPathInfo(), '/webdav/') === 0 || $this->request->getPathInfo() === '/dav/files' || - strpos($this->request->getPathInfo(), '/dav/files/') === 0 + strpos($this->request->getPathInfo(), '/dav/files/') === 0 || + $this->request->getPathInfo() === '/dav/uploads' || + strpos($this->request->getPathInfo(), '/dav/uploads/') === 0 ); } |