Merge branch 'master' into events/33c3

1 files changed, 2 insertions, 2 deletions

diff --git a/view/feedback.php b/view/feedback.php
index c4ba146..cff9c8e 100644
--- a/view/feedback.php
+++ b/view/feedback.php
@@ -1,11 +1,11 @@
 <?php
 
-$feedback = new Feedback();
-if(!$feedback->isEnabled())
+if(!$conference->hasFeedback())
 	throw new NotFoundException('Feedback is disabled');
 
 $info = $_POST;
 
+$feedback = $conference->getFeedback();
 if($feedback->validate($info))
 {
 	$feedback->store($info);