Merge pull request #24459 from nextcloud/fix/23096/workflow-fix-mimetype-check-for-directories
Only execute plain mimetype check for directories and do the fallback…
This commit is contained in:
commit
09754461df
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue