From 6ce2b0d94b837b4dc2a8b5a3425deaa2063e14d4 Mon Sep 17 00:00:00 2001
From: jerome mouneyrac <jerome@moodle.com>
Date: Wed, 28 Jul 2010 02:27:07 +0000
Subject: [PATCH] webservice MDL-23536 fix missing test when no missing
 capability

---
 admin/webservice/service_users.php | 2 +-
 lib/adminlib.php                   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/admin/webservice/service_users.php b/admin/webservice/service_users.php
index ed7dba056e4..dbce3552f1a 100644
--- a/admin/webservice/service_users.php
+++ b/admin/webservice/service_users.php
@@ -97,7 +97,7 @@ $usersmissingcaps = $webservicemanager->get_missing_capabilities_by_users($allow
 
 //add the missing capabilities to the allowed users object to be displayed by renderer
 foreach ($allowedusers as &$alloweduser) {
-    if (!is_siteadmin($alloweduser->id)) {
+    if (!is_siteadmin($alloweduser->id) and key_exists($alloweduser->id, $usersmissingcaps)) {
         $alloweduser->missingcapabilities = implode(',', $usersmissingcaps[$alloweduser->id]);
     }
 }
diff --git a/lib/adminlib.php b/lib/adminlib.php
index d8f2cefebb4..95036cbf25e 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -6980,7 +6980,8 @@ class admin_setting_managewebservicetokens extends admin_setting {
                 $usermissingcaps = $webservicemanager->get_missing_capabilities_by_users(
                         array(array('id' => $token->userid)), $token->serviceid);
 
-                if (!is_siteadmin($token->userid)) {
+                if (!is_siteadmin($token->userid) and
+                        key_exists($token->userid, $usermissingcaps)) {
                     $missingcapabilities = implode(',',
                             $usermissingcaps[$token->userid]);
                     if (!empty($missingcapabilities)) {