Merge branch 'fix-develop' into 'develop'

Fix develop

See merge request framasoft/framadate!232

app/classes/Framadate/Services/PollService.php

@@ -296,7 +296,7 @@ class PollService {
         $best_choices = $this->computeBestChoices($votes);
         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 ($nb_choice >= $poll->ValueMax && $user_choice[$i] === "2") {
+	     if ($poll->ValueMax !== null && $nb_choice >= $poll->ValueMax && $user_choice[$i] === "2") {
                 throw new ConcurrentVoteException();
             }
         }

app/classes/Framadate/Utils.php

@@ -88,7 +88,7 @@ class Utils {
      */
     public static function getUrlSondage($id, $admin = false, $vote_id = '', $action = null, $action_value = null) {
         // 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 ($admin === true) {
@@ -98,8 +98,8 @@ class Utils {
             }
             if ($vote_id !== '') {
                 $url .= '/vote/' . $vote_id . "#edit";
-            } elseif ($action !== null) {
-                if ($action_value !== null) {
+            } elseif ($action) {
+                if ($action_value) {
                     $url .= '/action/' . $action . '/' . $action_value;
                 } else {
                     $url .= '/action/' . $action;