L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sam Hemelryk
2012-10-16 11:22:44 +08:00
parent cecd632a8a 71daa4a6d6
commit d270f6c22d
9 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/webservice/service_users.php
+1 -1
View File
@@ -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) and key_exists($alloweduser->id, $usersmissingcaps)) {
if (!is_siteadmin($alloweduser->id) and array_key_exists($alloweduser->id, $usersmissingcaps)) {
$alloweduser->missingcapabilities = implode(', ', $usersmissingcaps[$alloweduser->id]);
}
}
blocks/community/forms.php
+1 -1
View File
@@ -140,7 +140,7 @@ class community_hub_search_form extends moodleform {
$options = array();
$firsthub = false;
foreach ($hubs as $hub) {
if (key_exists('id', $hub)) {
if (array_key_exists('id', $hub)) {
$params = array('hubid' => $hub['id'],
'filetype' => HUB_HUBSCREENSHOT_FILE_TYPE);
$imgurl = new moodle_url(HUB_HUBDIRECTORYURL .
course/externallib.php
+5 -5
View File
@@ -267,7 +267,7 @@ class core_course_external extends external_api {
array('options' => $options));
//retrieve courses
if (!key_exists('ids', $params['options'])
if (!array_key_exists('ids', $params['options'])
or empty($params['options']['ids'])) {
$courses = $DB->get_records('course');
} else {
@@ -504,13 +504,13 @@ class core_course_external extends external_api {
require_capability('moodle/course:create', $context);
// Make sure lang is valid
if (key_exists('lang', $course) and empty($availablelangs[$course['lang']])) {
if (array_key_exists('lang', $course) and empty($availablelangs[$course['lang']])) {
throw new moodle_exception(
get_string('errorinvalidparam', 'webservice', 'lang'));
}
// Make sure theme is valid
if (key_exists('forcetheme', $course)) {
if (array_key_exists('forcetheme', $course)) {
if (!empty($CFG->allowcoursethemes)) {
if (empty($availablethemes[$course['forcetheme']])) {
throw new moodle_exception(
@@ -530,10 +530,10 @@ class core_course_external extends external_api {
//set default value for completion
$courseconfig = get_config('moodlecourse');
if (completion_info::is_enabled_for_site()) {
if (!key_exists('enablecompletion', $course)) {
if (!array_key_exists('enablecompletion', $course)) {
$course['enablecompletion'] = $courseconfig->enablecompletion;
}
if (!key_exists('completionstartonenrol', $course)) {
if (!array_key_exists('completionstartonenrol', $course)) {
$course['completionstartonenrol'] = $courseconfig->completionstartonenrol;
}
} else {
enrol/externallib.php
+2 -2
View File
@@ -371,7 +371,7 @@ class core_role_external extends external_api {
// throw an exception if user is not able to assign the role in this context
$roles = get_assignable_roles($context, ROLENAME_SHORT);
if (!key_exists($assignment['roleid'], $roles)) {
if (!array_key_exists($assignment['roleid'], $roles)) {
throw new invalid_parameter_exception('Can not assign roleid='.$assignment['roleid'].' in contextid='.$assignment['contextid']);
}
@@ -433,7 +433,7 @@ class core_role_external extends external_api {
// throw an exception if user is not able to unassign the role in this context
$roles = get_assignable_roles($context, ROLENAME_SHORT);
if (!key_exists($unassignment['roleid'], $roles)) {
if (!array_key_exists($unassignment['roleid'], $roles)) {
throw new invalid_parameter_exception('Can not unassign roleid='.$unassignment['roleid'].' in contextid='.$unassignment['contextid']);
}
enrol/manual/externallib.php
+1 -1
View File
@@ -90,7 +90,7 @@ class enrol_manual_external extends external_api {
//throw an exception if user is not able to assign the role
$roles = get_assignable_roles($context);
if (!key_exists($enrolment['roleid'], $roles)) {
if (!array_key_exists($enrolment['roleid'], $roles)) {
$errorparams = new stdClass();
$errorparams->roleid = $enrolment['roleid'];
$errorparams->courseid = $enrolment['courseid'];
lib/adminlib.php
+1 -1
View File
@@ -7584,7 +7584,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)) {
lib/upgradelib.php
+2 -2
View File
@@ -877,7 +877,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;
@@ -893,7 +893,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);
webservice/lib.php
+1 -1
View File
@@ -511,7 +511,7 @@ class webservice {
//detect the missing capabilities
foreach ($servicecaps as $functioname => $functioncaps) {
foreach ($functioncaps as $functioncap) {
if (!key_exists($functioncap, $usercaps)) {
if (!array_key_exists($functioncap, $usercaps)) {
if (!isset($usersmissingcaps[$user->id])
or array_search($functioncap, $usersmissingcaps[$user->id]) === false) {
$usersmissingcaps[$user->id][] = $functioncap;
webservice/simpletest/testwebservice.php
+3 -3
View File
@@ -448,15 +448,15 @@ class webservice_test extends UnitTestCase {
$dbcourses[$course['id']]->timecreated);
$this->assertEqual($course['timemodified'],
$dbcourses[$course['id']]->timemodified);
if (key_exists('enablecompletion', $course)) {
if (array_key_exists('enablecompletion', $course)) {
$this->assertEqual($course['enablecompletion'],
$dbcourses[$course['id']]->enablecompletion);
}
if (key_exists('completionstartonenrol', $course)) {
if (array_key_exists('completionstartonenrol', $course)) {
$this->assertEqual($course['completionstartonenrol'],
$dbcourses[$course['id']]->completionstartonenrol);
}
if (key_exists('completionnotify', $course)) {
if (array_key_exists('completionnotify', $course)) {
$this->assertEqual($course['completionnotify'],
$dbcourses[$course['id']]->completionnotify);
}