Permalink
Browse files

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

…ODLE_22_STABLE
  • Loading branch information...
2 parents cad8d5c + 59c1a98 commit 78baf38ea4d9de59157a9a57de93c466bf9b5de2 Sam Hemelryk committed Dec 8, 2011
Showing with 2 additions and 2 deletions.
  1. +1 −1 tag/coursetags_edit.php
  2. +1 −1 user/profile/field/checkbox/field.class.php
View
@@ -41,7 +41,7 @@
}
// 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);
@@ -29,7 +29,7 @@ function edit_field_add(&$mform) {
$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');
}
}

0 comments on commit 78baf38

Please sign in to comment.