From 371d354ab3eb85c7315c4982a800a6b217cd905e Mon Sep 17 00:00:00 2001 From: Nathan Mares Date: Tue, 17 Jul 2012 19:11:57 +1000 Subject: [PATCH] MDL-34368: Fix broken query in so tokens are correctly checked against the linked service --- webservice/lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webservice/lib.php b/webservice/lib.php index 4fac2e9722a..afba3a4e614 100644 --- a/webservice/lib.php +++ b/webservice/lib.php @@ -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()));