Mirrors/framadate
1
0
Fork 0
mirror of https://framagit.org/framasoft/framadate/framadate synced 2026-01-23 02:14:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Olivier Perez 2015-10-29 09:42:30 +01:00
commit 1ba245258a
3 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
adminstuds.php
View file

@ -53,12 +53,13 @@ $notificationService = new NotificationService($mailService);
if (!empty($_GET['poll'])) {
$admin_poll_id = filter_input(INPUT_GET, 'poll', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => POLL_REGEX]]);
if (strlen($admin_poll_id) === 24) {
$poll_id = substr($admin_poll_id, 0, 16);
$poll = $pollService->findById($poll_id);
$poll = $pollService->findByAdminId($admin_poll_id);
}
}
if (!$poll) {
if ($poll) {
$poll_id = $poll->id;
} else {
$smarty->assign('error', __('Error', 'This poll doesn\'t exist !'));
$smarty->display('error.tpl');
exit;