From e356b71b175909ff8c79010d501166d516a1dbfb Mon Sep 17 00:00:00 2001
From: coderkun <coderkun@users.noreply.github.com>
Date: Mon, 17 Feb 2014 02:19:00 +0100
Subject: [PATCH] implement different media for Quest- and Sidequesttexts
 (Ticket #26)

---
 controllers/QuestsController.inc | 11 ++++++++---
 models/QuesttextsModel.inc       |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/controllers/QuestsController.inc b/controllers/QuestsController.inc
index dda3e718..b5df177c 100644
--- a/controllers/QuestsController.inc
+++ b/controllers/QuestsController.inc
@@ -95,12 +95,14 @@
 			
 			// Media
 			$questmedia = null;
-			if(!is_null($quest['questsmedia_id'])) {
+			if(!is_null($questtext) && !empty($questtext['questsmedia_id'])) {
+				$questmedia = $this->Media->getMediaById($questtext['questsmedia_id']);
+			}
+			elseif(!is_null($quest['questsmedia_id'])) {
 				$questmedia = $this->Media->getMediaById($quest['questsmedia_id']);
 			}
 					
 			
-			
 			// Pass data to view
 			$this->set('seminary', $seminary);
 			$this->set('questgroup', $questgroup);
@@ -166,7 +168,10 @@
 			
 			// Media
 			$sidequestmedia = null;
-			if(!is_null($sidequest['questsmedia_id'])) {
+			if(!is_null($sidequesttext) && !empty($sidequesttext['questsmedia_id'])) {
+				$sidequestmedia = $this->Media->getMediaById($sidequesttext['questsmedia_id']);
+			}
+			elseif(!is_null($sidequest['questsmedia_id'])) {
 				$sidequestmedia = $this->Media->getMediaById($sidequest['questsmedia_id']);
 			}
 			
diff --git a/models/QuesttextsModel.inc b/models/QuesttextsModel.inc
index 50a9f85a..3a7d8526 100644
--- a/models/QuesttextsModel.inc
+++ b/models/QuesttextsModel.inc
@@ -46,7 +46,7 @@
 		public function getQuesttextByUrl($questId, $questtexttypeUrl, $pos)
 		{
 			$data = $this->db->query(
-				'SELECT questtexts.id, questtexts.text, questtexts.pos, questtexts.out_text, questtexttypes.id AS type_id, questtexttypes.type, questtexttypes.url AS type_url '.
+				'SELECT questtexts.id, questtexts.text, questtexts.pos, questtexts.out_text, questtexts.questsmedia_id, questtexttypes.id AS type_id, questtexttypes.type, questtexttypes.url AS type_url '.
 				'FROM questtexts '.
 				'LEFT JOIN questtexttypes ON questtexttypes.id = questtexts.questtexttype_id '.
 				'WHERE questtexts.quest_id = ? AND questtexttypes.url = ? AND questtexts.pos = ?',
@@ -74,7 +74,7 @@
 		public function getSidequesttextByUrl($sidequestId, $questtexttypeUrl, $pos)
 		{
 			$data = $this->db->query(
-				'SELECT sidequesttexts.id, sidequesttexts.text, sidequesttexts.pos, sidequesttexts.out_text, sidequesttexts.abort_text, questtexttypes.id AS type_id, questtexttypes.type, questtexttypes.url AS type_url '.
+				'SELECT sidequesttexts.id, sidequesttexts.text, sidequesttexts.pos, sidequesttexts.out_text, sidequesttexts.abort_text, sidequesttexts.questsmedia_id, questtexttypes.id AS type_id, questtexttypes.type, questtexttypes.url AS type_url '.
 				'FROM sidequesttexts '.
 				'LEFT JOIN questtexttypes ON questtexttypes.id = sidequesttexts.questtexttype_id '.
 				'WHERE sidequesttexts.sidequest_id = ? AND questtexttypes.url = ? AND sidequesttexts.pos = ?',