MDL-34368: Fix broken query in so tokens are correctly checked against the linked...
authorNathan Mares <nathan@catalyst-au.net>
Tue, 17 Jul 2012 09:11:57 +0000 (19:11 +1000)
committerNathan Mares <nathan@catalyst-au.net>
Tue, 17 Jul 2012 09:11:57 +0000 (19:11 +1000)
webservice/lib.php

index 4fac2e9..afba3a4 100644 (file)
@@ -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()));