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

Merge branch 'fix-#283' into 'develop'

Browse Source 
Fix URL Routing for actions

Closes #283

See merge request framasoft/framadate!249
This commit is contained in:
Thomas Citharel 2018-03-23 09:21:37 +01:00
commit 6ed3a0c3cf
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,11 +84,13 @@ class Utils {
* @param string $id The poll's id * @param string $id The poll's id
* @param bool $admin True to generate an admin URL, false for a public one * @param bool $admin True to generate an admin URL, false for a public one
* @param string $vote_id (optional) The vote's unique id * @param string $vote_id (optional) The vote's unique id
* @param null $action
* @param null $action_value
* @return string The poll's URL. * @return string The poll's URL.
*/ */
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 : Utils::base64url_encode($action_value); $action_value = $action_value ? Utils::base64url_encode($action_value) : null;
if (URL_PROPRE) { if (URL_PROPRE) {
if ($admin === true) { if ($admin === true) {