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

[stable19] Only execute plain mimetype check for directories and do the fallback…
nextcloud · Dec 3, 2020 · 80efa64 · 80efa64
2 parents c4d29cc + a305573
commit 80efa64
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/apps/workflowengine/lib/Check/FileMimeType.php b/apps/workflowengine/lib/Check/FileMimeType.php
@@ -102,8 +102,12 @@ protected function cacheAndReturnMimeType(string $storageId, ?string $path, stri
 	 */
 	public function executeCheck($operator, $value) {
 		$actualValue = $this->getActualValue();
-		return $this->executeStringCheck($operator, $value, $actualValue) ||
-			$this->executeStringCheck($operator, $value, $this->mimeTypeDetector->detectPath($this->path));
+		$plainMimetypeResult = $this->executeStringCheck($operator, $value, $actualValue);
+		if ($actualValue === 'httpd/unix-directory') {
+			return $plainMimetypeResult;
+		}
+		$detectMimetypeBasedOnFilenameResult = $this->executeStringCheck($operator, $value, $this->mimeTypeDetector->detectPath($this->path));
+		return $plainMimetypeResult || $detectMimetypeBasedOnFilenameResult;
 	}
 
 	/**