From 510f6a869f933d48d16dc67704c5af86336c9d19 Mon Sep 17 00:00:00 2001
From: coderkun <coderkun@localhost>
Date: Sat, 3 May 2014 22:37:04 +0200
Subject: [PATCH] use client?s mimetype as fallback for uploads

---
 controllers/CharactergroupsquestsController.inc | 2 +-
 questtypes/submit/SubmitQuesttypeController.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/controllers/CharactergroupsquestsController.inc b/controllers/CharactergroupsquestsController.inc
index 08aab869..09a0da0d 100644
--- a/controllers/CharactergroupsquestsController.inc
+++ b/controllers/CharactergroupsquestsController.inc
@@ -153,7 +153,7 @@
 					
 					// Check mimetype
 					$mediaMimetype = null;
-					$file['mimetype'] = \hhu\z\Utils::getMimetype($file['tmp_name']);
+					$file['mimetype'] = \hhu\z\Utils::getMimetype($file['tmp_name'], $file['type']);
 					foreach($mimetypes as &$mimetype) {
 						if($mimetype['mimetype'] == $file['mimetype']) {
 							$mediaMimetype = $mimetype;
diff --git a/questtypes/submit/SubmitQuesttypeController.inc b/questtypes/submit/SubmitQuesttypeController.inc
index ed78529f..d8d33186 100644
--- a/questtypes/submit/SubmitQuesttypeController.inc
+++ b/questtypes/submit/SubmitQuesttypeController.inc
@@ -56,7 +56,7 @@
 				// Check mimetype
 				$mimetypes = $this->Submit->getAllowedMimetypes($seminary['id']);
 				$answerMimetype = null;
-				$answer['mimetype'] = \hhu\z\Utils::getMimetype($answer['tmp_name']);
+				$answer['mimetype'] = \hhu\z\Utils::getMimetype($answer['tmp_name'], $answer['type']);
 				foreach($mimetypes as &$mimetype) {
 					if($mimetype['mimetype'] == $answer['mimetype']) {
 						$answerMimetype = $mimetype;