MDL-30225 Creating new web service tokens create error

moodle · Apr 17, 2012 · adca184 · adca184
1 parent 35eb31f
commit adca184
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/webservice/lib.php b/webservice/lib.php
@@ -477,9 +477,9 @@ public function get_service_required_capabilities($serviceid) {
     public function get_user_capabilities($userid) {
         global $DB;
         //retrieve the user capabilities
-        $sql = "SELECT rc.id, rc.capability FROM {role_capabilities} rc, {role_assignments} ra
-            WHERE rc.roleid=ra.roleid AND ra.userid= ?";
-        $dbusercaps = $DB->get_records_sql($sql, array($userid));
+        $sql = "SELECT DISTINCT rc.id, rc.capability FROM {role_capabilities} rc, {role_assignments} ra
+            WHERE rc.roleid=ra.roleid AND ra.userid= ? AND rc.permission = ?";
+        $dbusercaps = $DB->get_records_sql($sql, array($userid, CAP_ALLOW));
         $usercaps = array();
         foreach ($dbusercaps as $usercap) {
             $usercaps[$usercap->capability] = true;