aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-10-29 23:28:39 +0100
committerGitHub <noreply@github.com>2018-10-29 23:28:39 +0100
commit2d5047849238c4130ca8ec78e29c9e9edcb359e2 (patch)
tree03f881ba57f46fce7b2ddabfa653b856a0588ad2
parent963d968f062810e846f000f02f1be3f560c286f9 (diff)
parent90dc8fb42e209e8bccd1f9801c85c21e9894227f (diff)
downloadnextcloud-server-2d5047849238c4130ca8ec78e29c9e9edcb359e2.tar.gz
nextcloud-server-2d5047849238c4130ca8ec78e29c9e9edcb359e2.zip
Merge pull request #12127 from nextcloud/fix/proper_folder_mimetype
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') {