Merge branch 'mdl34368' of https://bitbucket.org/ngmares/moodle into …

…MOODLE_23_STABLE
moodle · Jul 30, 2012 · 4689599 · 4689599
2 parents b700c34 + 371d354
commit 4689599
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/webservice/lib.php b/webservice/lib.php
@@ -1110,7 +1110,7 @@ protected function init_service_class() {
                   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()));