From 4b6f7b685ec3590c77d44bcc95bb13c386bac4d2 Mon Sep 17 00:00:00 2001
From: Olivier PEREZ <olivier@olivierperez.fr>
Date: Mon, 5 Oct 2015 23:50:51 +0200
Subject: [PATCH] getUrlSondage: Cannot define links for EDIT and ACTION at the
same time
---
app/classes/Framadate/Utils.php | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/app/classes/Framadate/Utils.php b/app/classes/Framadate/Utils.php
index aca9b9ba..250528b8 100644
--- a/app/classes/Framadate/Utils.php
+++ b/app/classes/Framadate/Utils.php
@@ -112,8 +112,7 @@ class Utils {
}
if ($vote_id != '') {
$url .= '/vote/' . $vote_id . "#edit";
- }
- if ($action != null && $action_value != null) {
+ } elseif ($action != null && $action_value != null) {
$url .= '/action/' . $action . '/' . $action_value;
}
} else {
@@ -124,8 +123,7 @@ class Utils {
}
if ($vote_id != '') {
$url .= '&vote=' . $vote_id . "#edit";
- }
- if ($action != null && $action_value != null) {
+ } elseif ($action != null && $action_value != null) {
$url .= '&' . $action . "=" . $action_value;
}
}
--
GitLab