Merge branch 'MDL-30518' of git://github.com/mackensen/moodle

This commit is contained in:
Sam Hemelryk 2011-12-08 16:05:26 +13:00
commit 9c6b40c614
2 changed files with 2 additions and 2 deletions

View File

@ -41,7 +41,7 @@ if ($courseid != SITEID) {
}
// Permissions
$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
$sitecontext = get_context_instance(CONTEXT_SYSTEM);
require_login($course->id);
$canedit = has_capability('moodle/tag:create', $sitecontext);

View File

@ -29,7 +29,7 @@ class profile_field_checkbox extends profile_field_base {
$checkbox->setChecked(true);
}
$mform->setType($this->inputname, PARAM_BOOL);
if ($this->is_required() and !has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
if ($this->is_required() and !has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM))) {
$mform->addRule($this->inputname, get_string('required'), 'nonzero', null, 'client');
}
}