Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'fix-develop' into 'develop'

Browse Source 
Fix develop

See merge request framasoft/framadate!232
This commit is contained in:
Thomas Citharel 2018-03-19 10:29:18 +01:00
commit 915fe17bfc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/classes/Framadate/Services/PollService.php
View File

@ -296,7 +296,7 @@ class PollService {
$best_choices = $this->computeBestChoices($votes); $best_choices = $this->computeBestChoices($votes);
foreach ($best_choices['y'] as $i => $nb_choice) { foreach ($best_choices['y'] as $i => $nb_choice) {
// if for this option we have reached maximum value and user wants to add itself too // if for this option we have reached maximum value and user wants to add itself too
if ($nb_choice >= $poll->ValueMax && $user_choice[$i] === "2") { if ($poll->ValueMax !== null && $nb_choice >= $poll->ValueMax && $user_choice[$i] === "2") {
throw new ConcurrentVoteException(); throw new ConcurrentVoteException();
} }
} }

6
app/classes/Framadate/Utils.php
View File

@ -88,7 +88,7 @@ class Utils {
*/ */
public static function getUrlSondage($id, $admin = false, $vote_id = '', $action = null, $action_value = null) { public static function getUrlSondage($id, $admin = false, $vote_id = '', $action = null, $action_value = null) {
// URL-Encode $action_value // URL-Encode $action_value
$action_value = $action_value === null ? null : Utils::base64url_encode($action_value); $action_value = $action_value ? null : Utils::base64url_encode($action_value);
if (URL_PROPRE) { if (URL_PROPRE) {
if ($admin === true) { if ($admin === true) {
@ -98,8 +98,8 @@ class Utils {
} }
if ($vote_id !== '') { if ($vote_id !== '') {
$url .= '/vote/' . $vote_id . "#edit"; $url .= '/vote/' . $vote_id . "#edit";
} elseif ($action !== null) { } elseif ($action) {
if ($action_value !== null) { if ($action_value) {
$url .= '/action/' . $action . '/' . $action_value; $url .= '/action/' . $action . '/' . $action_value;
} else { } else {
$url .= '/action/' . $action; $url .= '/action/' . $action;