Merge branch 'develop' into 'master'
Version 1.1.0-beta.1 See merge request framasoft/framadate!253
This commit is contained in:
commit
07a311239a
@ -84,11 +84,13 @@ class Utils {
|
||||
* @param string $id The poll's id
|
||||
* @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 null $action
|
||||
* @param null $action_value
|
||||
* @return string The poll's URL.
|
||||
*/
|
||||
public static function getUrlSondage($id, $admin = false, $vote_id = '', $action = null, $action_value = null) {
|
||||
// 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 ($admin === true) {
|
||||
|
Loading…
Reference in New Issue
Block a user