Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
integration
prechecker
Commits
4c7f5363
Commit
4c7f5363
authored
Aug 01, 2012
by
Petr Škoda
Browse files
MDL-34368 fix another validuntil condition
parent
d3d1fec2
Changes
1
Hide whitespace changes
Inline
Side-by-side
webservice/lib.php
View file @
4c7f5363
...
...
@@ -1612,7 +1612,7 @@ abstract class webservice_base_server extends webservice_server {
FROM
{
external_services
}
s
JOIN
{
external_services_functions
}
sf ON (sf.externalserviceid = s.id AND s.restrictedusers = 1 AND sf.functionname = :name2)
JOIN
{
external_services_users
}
su ON (su.externalserviceid = s.id AND su.userid = :userid)
WHERE s.enabled = 1 AND su.validuntil IS NULL OR su.validuntil < :now
$wscond2
"
;
WHERE s.enabled = 1 AND
(
su.validuntil IS NULL OR su.validuntil < :now
)
$wscond2
"
;
$params
=
array_merge
(
$params
,
array
(
'userid'
=>
$USER
->
id
,
'name1'
=>
$function
->
name
,
'name2'
=>
$function
->
name
,
'now'
=>
time
()));
$rs
=
$DB
->
get_recordset_sql
(
$sql
,
$params
);
...
...
Write
Preview
Supports
Markdown
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