MDL-14460, fix get_context_instance, merged from MOODLE_19_STABLE, see tracker.

diff --git a/calendar/lib.php b/calendar/lib.php
index 7038eb10ac7bd11cdd78c2e303baed6d63c89f41..c12b9546614ba35ffa5ab011b2b43d6dbf6d7f61 100644 (file)
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -1292,7 +1292,7 @@ function calendar_set_filters(&$courses, &$group, &$user, $courseeventsfrom = NU
         }
 
         // XXX TODO: not sure how to replace $CFG->calendar_adminseesall
-        if(has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM, SITEID)) && !empty($CFG->calendar_adminseesall)) {
+        if(has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM)) && !empty($CFG->calendar_adminseesall)) {
             $group = true;
         }
         else {
@@ -1377,7 +1377,7 @@ function calendar_edit_event_allowed($event) {
         return false;
     }
 
-    $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    $sitecontext = get_context_instance(CONTEXT_SYSTEM);
     // if user has manageentries at site level, return true
     if (has_capability('moodle/calendar:manageentries', $sitecontext)) {
         return true;

diff --git a/calendar/view.php b/calendar/view.php
index a8c9431222c7f9cac7c77ec5046847c829ed3b80..6eb8184ff47981a67db3b543852d5ff2de7c1ed6 100644 (file)
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -608,7 +608,7 @@ function calendar_course_filter_selector($getvars = '') {
         return '';
     }
 
-    if (has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM, SITEID)) && !empty($CFG->calendar_adminseesall)) {
+    if (has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM)) && !empty($CFG->calendar_adminseesall)) {
         $courses = get_courses('all', 'c.shortname','c.id,c.shortname');
     } else {
         $courses = get_my_courses($USER->id, 'shortname');

diff --git a/mnet/testclient.php b/mnet/testclient.php
index 8349e8d9598bdfac662e6b5325b72601c181ba47..1f8d15643d899f68e27131a9bbea8e246ca7fcfb 100644 (file)
--- a/mnet/testclient.php
+++ b/mnet/testclient.php
@@ -14,7 +14,7 @@ require_once(dirname(dirname(__FILE__)) . '/config.php');
 require_once $CFG->dirroot.'/mnet/xmlrpc/client.php';
 
 // Site admins only, thanks.
-$context = get_context_instance(CONTEXT_SYSTEM, SITEID);
+$context = get_context_instance(CONTEXT_SYSTEM);
 require_capability('moodle/site:config', $context);
 
 error_reporting(E_ALL);

diff --git a/user/profile/lib.php b/user/profile/lib.php
index c45074e936fb75860ccb2117150282d4e6ece309..84878f6a384b4133e9462bab0abaccb345b3a68d 100644 (file)
--- a/user/profile/lib.php
+++ b/user/profile/lib.php
@@ -65,7 +65,7 @@ class profile_field_base {
     function edit_field(&$mform) {
 
         if ($this->field->visible != PROFILE_VISIBLE_NONE
-          or has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+          or has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM))) {
 
             $this->edit_field_add($mform);
             $this->edit_field_set_default($mform);
@@ -127,7 +127,7 @@ class profile_field_base {
      * @param   object   instance of the moodleform class
      */
     function edit_field_set_required(&$mform) {
-        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'), 'required', null, 'client');
         }
     }
@@ -137,7 +137,7 @@ class profile_field_base {
      * @param   object   instance of the moodleform class
      */
     function edit_field_set_locked(&$mform) {
-        if ($this->is_locked() and !has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+        if ($this->is_locked() and !has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM))) {
             $mform->hardFreeze($this->inputname);
         }
     }
@@ -229,7 +229,7 @@ class profile_field_base {
             case PROFILE_VISIBLE_PRIVATE:
                 return ($this->userid == $USER->id);
             default:
-                return has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID));
+                return has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM));
         }
     }
 

diff --git a/userpix/index.php b/userpix/index.php
index a88ae2e34a6b9a774bd4fd7a4c911c1cb26af1ed..543af8976e3303840404feab08ee15cbf55d9fcd 100644 (file)
--- a/userpix/index.php
+++ b/userpix/index.php
@@ -11,7 +11,7 @@
     require_login();
 
 /// Remove the following three lines if you want everyone to access it
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
     if (!$users = get_records("user", "picture", "1", "lastaccess DESC", "id,firstname,lastname")) {
         print_error("no users!");

diff --git a/userpix/upgrade.php b/userpix/upgrade.php
index c0fe0a7babf9059a135e351ef3eb36ff9db179d9..43f25750416c1ef47fe3815a55c670f2fc3dee0f 100644 (file)
--- a/userpix/upgrade.php
+++ b/userpix/upgrade.php
@@ -7,7 +7,7 @@
 
     require_login();
 
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
     if (!$users = get_records("user", "picture", "1", "lastaccess DESC", "id,firstname,lastname")) {
         print_error("no users!");