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

Merge pull request #24518 from nextcloud/backport/24459/stable19 

[stable19] Only execute plain mimetype check for directories and do the fallback…
This commit is contained in:
Morris Jobke 2020-12-03 09:15:33 +01:00 committed by GitHub
parent c4d29cc3f1 a305573abd
commit 80efa644f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;
} }
/** /**