moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 18:36:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-35198' of git://github.com/mouneyrac/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2012-10-16 11:23:24 +08:00
commit 8422094d91
8 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/adminlib.php
View file

@ -7638,7 +7638,7 @@ class admin_setting_managewebservicetokens extends admin_setting {
array(array('id' => $token->userid)), $token->serviceid);
if (!is_siteadmin($token->userid) and
key_exists($token->userid, $usermissingcaps)) {
array_key_exists($token->userid, $usermissingcaps)) {
$missingcapabilities = implode(', ',
$usermissingcaps[$token->userid]);
if (!empty($missingcapabilities)) {

4
lib/upgradelib.php
View file

@ -966,7 +966,7 @@ function external_update_descriptions($component) {
$dbfunction->classpath = $function['classpath'];
$update = true;
}
$functioncapabilities = key_exists('capabilities', $function)?$function['capabilities']:'';
$functioncapabilities = array_key_exists('capabilities', $function)?$function['capabilities']:'';
if ($dbfunction->capabilities != $functioncapabilities) {
$dbfunction->capabilities = $functioncapabilities;
$update = true;
@ -982,7 +982,7 @@ function external_update_descriptions($component) {
$dbfunction->methodname = $function['methodname'];
$dbfunction->classpath = empty($function['classpath']) ? null : $function['classpath'];
$dbfunction->component = $component;
$dbfunction->capabilities = key_exists('capabilities', $function)?$function['capabilities']:'';
$dbfunction->capabilities = array_key_exists('capabilities', $function)?$function['capabilities']:'';
$dbfunction->id = $DB->insert_record('external_functions', $dbfunction);
}
unset($functions);