Skip to content
GitLab
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
6bfa9c49
Commit
6bfa9c49
authored
Jul 17, 2012
by
Nathan Mares
Committed by
Dan Poltawski
Jul 30, 2012
Browse files
MDL-34368: Fix broken query in so tokens are correctly checked against the linked service
parent
87dd647f
Changes
1
Hide whitespace changes
Inline
Side-by-side
webservice/lib.php
View file @
6bfa9c49
...
...
@@ -1110,7 +1110,7 @@ abstract class webservice_zend_server extends webservice_server {
FROM
{
external_services
}
s
JOIN
{
external_services_functions
}
sf ON (sf.externalserviceid = s.id AND s.restrictedusers = 1)
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
,
'now'
=>
time
()));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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