Merge pull request #2128 from MGatner/getextension-null

guessExtension fallback to clientExtension
codeigniter4 · Aug 13, 2019 · 48ca50b · 48ca50b
2 parents d2f2ada + 8e4e17a
commit 48ca50b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
@@ -356,9 +356,9 @@ public function getExtension(): string
 	 *
 	 * @return string|null
 	 */
-	public function guessExtension(): ?string
+	public function guessExtension(): string
 	{
-		return Mimes::guessExtensionFromType($this->getClientMimeType(), $this->getClientExtension());
+		return Mimes::guessExtensionFromType($this->getClientMimeType(), $this->getClientExtension()) ?? $this->getClientExtension();
 	}
 
 	//--------------------------------------------------------------------