summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-11-06 18:13:45 +0100
committerGitHub <noreply@github.com>2018-11-06 18:13:45 +0100
commit1cac2413186100866c88e6e0ad0269832ef2928f (patch)
treedcf4347763a65191eaf2d4801b953a8fc2ebde52
parent450b9e2a2088570ed6212d85b971c18e44af1601 (diff)
parentfc49fa16208661c8890e45b0441ec5daf7ca2d48 (diff)
downloadnextcloud-server-1cac2413186100866c88e6e0ad0269832ef2928f.tar.gz
nextcloud-server-1cac2413186100866c88e6e0ad0269832ef2928f.zip
Merge pull request #12298 from nextcloud/backport/12127/stable13
[13] A folder should get a folder mimetype
-rw-r--r--apps/workflowengine/lib/Check/FileMimeType.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/workflowengine/lib/Check/FileMimeType.php b/apps/workflowengine/lib/Check/FileMimeType.php
index bd94ec9d5bc..5f572f5aa9d 100644
--- a/apps/workflowengine/lib/Check/FileMimeType.php
+++ b/apps/workflowengine/lib/Check/FileMimeType.php
@@ -76,6 +76,11 @@ class FileMimeType extends AbstractStringCheck {
return $this->mimeType[$this->storage->getId()][$this->path];
}
+ if ($this->storage->is_dir($this->path)) {
+ $this->mimeType[$this->storage->getId()][$this->path] = 'httpd/unix-directory';
+ return $this->mimeType[$this->storage->getId()][$this->path];
+ }
+
if ($this->isWebDAVRequest()) {
// Creating a folder
if ($this->request->getMethod() === 'MKCOL') {