From 374a2843934f2eff77a0416a51c79c3051cad2bb Mon Sep 17 00:00:00 2001
From: Antonin <antonin.murtin@gmail.com>
Date: Sat, 5 Dec 2015 14:00:55 +0100
Subject: [PATCH 1/2] Oublis sur le merge

---
 adminstuds.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/adminstuds.php b/adminstuds.php
index aa7eb24..03c7498 100644
--- a/adminstuds.php
+++ b/adminstuds.php
@@ -25,7 +25,8 @@ use Framadate\Services\LogService;
 use Framadate\Services\MailService;
 use Framadate\Services\PollService;
 use Framadate\Services\NotificationService;
-use  Framadate\Security\PasswordHasher;
+use Framadate\Security\PasswordHasher;
+use Framadate\Utils;
 
 include_once __DIR__ . '/app/inc/init.php';
 
@@ -395,5 +396,6 @@ $smarty->assign('admin', true);
 $smarty->assign('hidden', false);
 $smarty->assign('accessGranted', true);
 $smarty->assign('resultPubliclyVisible', true);
+$smarty->assign('editedVoteUniqueId', '');
 
 $smarty->display('studs.tpl');

From a42f232196b355e5cb57a997c4157bdc0464b781 Mon Sep 17 00:00:00 2001
From: Antonin <antonin.murtin@gmail.com>
Date: Sat, 5 Mar 2016 16:33:42 +0100
Subject: [PATCH 2/2] =?UTF-8?q?Ajout=20de=20commentaire=20sur=20un=20sonda?=
 =?UTF-8?q?ge=20nomm=C3=A9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 action/add_comment.php | 4 +---
 js/app/studs.js        | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/action/add_comment.php b/action/add_comment.php
index 85453e7..bc46ed0 100644
--- a/action/add_comment.php
+++ b/action/add_comment.php
@@ -52,9 +52,7 @@ $securityService = new SecurityService();
 
 if (!empty($_POST['poll'])) {
     $poll_id = filter_input(INPUT_POST, 'poll', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => POLL_REGEX]]);
-    if (strlen($poll_id) === 16) {
-        $poll = $pollService->findById($poll_id);
-    }
+    $poll = $pollService->findById($poll_id);
 }
 
 if (!$poll) {
diff --git a/js/app/studs.js b/js/app/studs.js
index 6a4b300..4ce106a 100644
--- a/js/app/studs.js
+++ b/js/app/studs.js
@@ -74,6 +74,7 @@ $(document).ready(function () {
                         newMessage
                             .find('.contents')
                             .text(data.message.message);
+                        newMessage.removeClass('hidden');
                         var commentsAlert = $('#comments_alerts');
                         commentsAlert
                             .empty()