Merge branch 'master' into events/33c3

1 files changed, 1 insertions, 4 deletions

diff --git a/view/feedback-read.php b/view/feedback-read.php
index 4f04a02..3c29dbd 100644
--- a/view/feedback-read.php
+++ b/view/feedback-read.php
@@ -1,9 +1,6 @@
 <?php
 
-$feedback = new Feedback();
-if(!$feedback->isEnabled())
-	throw new NotFoundException('Feedback is disabled');
-
+$feedback = $conference->getFeedback();
 if(!$feedback->isLoggedIn())
 {
 	$feedback->requestLogin();