Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
latoilescoute-dev
scoodle
Commits
915fe17b
Commit
915fe17b
authored
Mar 19, 2018
by
Thomas Citharel
Browse files
Merge branch 'fix-develop' into 'develop'
Fix develop See merge request framasoft/framadate!232
parents
bac91c91
26761c97
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/classes/Framadate/Services/PollService.php
View file @
915fe17b
...
...
@@ -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
View file @
915fe17b
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment