mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only execute plain mimetype check for directories and do the fallback only for non-directories 

Ref #23096

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2020-11-30 16:43:55 +01:00 committed by backportbot[bot]
parent fb874e5d6d
commit a305573abd
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/workflowengine/lib/Check/FileMimeType.php
View File

@ -102,8 +102,12 @@ class FileMimeType extends AbstractStringCheck implements IFileCheck {
*/ */
public function executeCheck($operator, $value) { public function executeCheck($operator, $value) {
$actualValue = $this->getActualValue(); $actualValue = $this->getActualValue();
return $this->executeStringCheck($operator, $value, $actualValue) || $plainMimetypeResult = $this->executeStringCheck($operator, $value, $actualValue);
$this->executeStringCheck($operator, $value, $this->mimeTypeDetector->detectPath($this->path)); if ($actualValue === 'httpd/unix-directory') {
return $plainMimetypeResult;
}
$detectMimetypeBasedOnFilenameResult = $this->executeStringCheck($operator, $value, $this->mimeTypeDetector->detectPath($this->path));
return $plainMimetypeResult || $detectMimetypeBasedOnFilenameResult;
} }
/** /**