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

sehaj-sk · Dec 8, 2011 · 9c6b40c · 9c6b40c
2 parents 4bd1fc7 + 59c1a98
commit 9c6b40c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tag/coursetags_edit.php b/tag/coursetags_edit.php
@@ -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);
 

diff --git a/user/profile/field/checkbox/field.class.php b/user/profile/field/checkbox/field.class.php
@@ -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');
         }
     }