Merge pull request #1453 from nowackipawel/patch-19

jim-parry · web-flow · commit 220a7618922e · 2018-11-11T11:00:24.000-08:00
BugFix  if there extension has only one mime type (string)
diff --git a/application/Config/Mimes.php b/application/Config/Mimes.php
@@ -313,7 +313,7 @@ public static function guessExtensionFromType(string $type, ?string $proposed_ex
 
 		$proposed_extension = trim(strtolower($proposed_extension));
 
-		if(!is_null($proposed_extension) && array_key_exists($proposed_extension, self::$mimes) && in_array($type, self::$mimes[$proposed_extension]))
+		if(!is_null($proposed_extension) && array_key_exists($proposed_extension, self::$mimes) && in_array($type, is_string(self::$mimes[$proposed_extension])?[self::$mimes[$proposed_extension]]:self::$mimes[$proposed_extension]))
 		{
 			return $proposed_extension;
 		}

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ public static function guessExtensionFromType(string $type, ?string $proposed_ex`
`313`	`313`
`314`	`314`	`$proposed_extension = trim(strtolower($proposed_extension));`
`315`	`315`
`316`		`- if(!is_null($proposed_extension) && array_key_exists($proposed_extension, self::$mimes) && in_array($type, self::$mimes[$proposed_extension]))`
	`316`	`+ if(!is_null($proposed_extension) && array_key_exists($proposed_extension, self::$mimes) && in_array($type, is_string(self::$mimes[$proposed_extension])?[self::$mimes[$proposed_extension]]:self::$mimes[$proposed_extension]))`
`317`	`317`	`{`
`318`	`318`	`return $proposed_extension;`
`319`	`319`	`}`