From db8c1b9b55d8dc87be60a1b0106c876b97288744 Mon Sep 17 00:00:00 2001
From: kindlm <kindlm@technikum-wien.at>
Date: Wed, 10 Jun 2015 19:48:38 +0200
Subject: [PATCH] Kleiner Fehler in Infoscreenverwaltung

---
 include/infoscreen.class.php              | 4 ++--
 vilesci/stammdaten/infoscreen_details.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/infoscreen.class.php b/include/infoscreen.class.php
index 6335bcbd5..29d8e2511 100755
--- a/include/infoscreen.class.php
+++ b/include/infoscreen.class.php
@@ -361,12 +361,12 @@ class infoscreen extends basis_db
 			$qry.="
 					AND (gueltigvon<=now() OR gueltigvon is null)
 					AND (gueltigbis>=now() OR gueltigbis is null)";
-		if($aktuell)
+		if($exklusiv)
 			$qry.="
 					AND CASE WHEN 
 					(
 						SELECT count(exklusiv) FROM campus.tbl_infoscreen_content 
-						WHERE (infoscreen_id=20 OR infoscreen_id is null) 
+						WHERE (infoscreen_id=".$this->db_add_param($infoscreen_id, FHC_INTEGER)." OR infoscreen_id is null) 
 						AND (gueltigvon<=now() OR gueltigvon is null) 
 						AND (gueltigbis>=now() OR gueltigbis is null)
 						AND exklusiv=true
diff --git a/vilesci/stammdaten/infoscreen_details.php b/vilesci/stammdaten/infoscreen_details.php
index 853393d08..3b6747bdf 100755
--- a/vilesci/stammdaten/infoscreen_details.php
+++ b/vilesci/stammdaten/infoscreen_details.php
@@ -290,7 +290,7 @@ $datum_obj = new datum();
 		</form>';
 	}
 	
-	if(!$infoscreen->getScreenContent($infoscreen_id, false))
+	if(!$infoscreen->getScreenContent($infoscreen_id, false, false))
 		die('Fehler:'.$infoscreen->errormsg);
 	echo '<table class="tablesorter" id="myTable">
 			<thead>