"MDL-14460,fix get_context_instance, merged from MOODLE_19_STABLE"

diff --git a/blog/edit.php b/blog/edit.php
index 888dc18db03a89f28c118e04ad1c27e2bf465114..7564deb369ffedb2d08bc5c08a9568596ac29c4c 100755 (executable)
--- a/blog/edit.php
+++ b/blog/edit.php
@@ -19,7 +19,7 @@ if (isguest()) {
     print_error('noguestpost', 'blog');
 }
 
-$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+$sitecontext = get_context_instance(CONTEXT_SYSTEM);
 if (!has_capability('moodle/blog:create', $sitecontext) and !has_capability('moodle/blog:manageentries', $sitecontext)) {
     print_error('cannoteditpostorblog');
 }

diff --git a/blog/index.php b/blog/index.php
index 8d8786dc401b08073c3210c80cda8532ee6b8460..4d54fd7614cdbff2ef14a6d4c9747821e6edefc0 100755 (executable)
--- a/blog/index.php
+++ b/blog/index.php
@@ -27,7 +27,7 @@ if (empty($CFG->bloglevel)) {
     print_error('blogdisable', 'blog');
 }
 
-$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+$sitecontext = get_context_instance(CONTEXT_SYSTEM);
 
 
 // change block edit staus if not guest and logged in

diff --git a/blog/lib.php b/blog/lib.php
index ba76e2b99f04117432485c022deae0042a4338b2..544af38ee42ee3e62320def1b47aea40617861f8 100755 (executable)
--- a/blog/lib.php
+++ b/blog/lib.php
@@ -77,7 +77,7 @@
         $bloglimit = optional_param('limit', get_user_preferences('blogpagesize', 10), PARAM_INT);
         $start     = $blogpage * $bloglimit;
 
-        $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+        $sitecontext = get_context_instance(CONTEXT_SYSTEM);
 
         $morelink = '<br />&nbsp;&nbsp;';
 
@@ -369,7 +369,7 @@
 
         global $CFG, $USER;
 
-        $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+        $sitecontext = get_context_instance(CONTEXT_SYSTEM);
 
         if (has_capability('moodle/blog:manageentries', $sitecontext)) {
             return true; // can edit any blog post
@@ -400,7 +400,7 @@
             return true; // can view own posts in any case
         }
 
-        $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+        $sitecontext = get_context_instance(CONTEXT_SYSTEM);
         if (has_capability('moodle/blog:manageentries', $sitecontext)) {
             return true; // can manage all posts
         }
@@ -524,7 +524,7 @@
             $tagquerysql = '';
         }
 
-        if (isloggedin() && !has_capability('moodle/legacy:guest', get_context_instance(CONTEXT_SYSTEM, SITEID), $USER->id, false)) {
+        if (isloggedin() && !has_capability('moodle/legacy:guest', get_context_instance(CONTEXT_SYSTEM), $USER->id, false)) {
             $permissionsql =  'AND (p.publishstate = \'site\' OR p.publishstate = \'public\' OR p.userid = '.$USER->id.')';
         } else {
             $permissionsql =  'AND p.publishstate = \'public\'';
@@ -532,7 +532,7 @@
 
         // fix for MDL-9165, use with readuserblogs capability in a user context can read that user's private blogs
         // admins can see all blogs regardless of publish states, as described on the help page
-        if (has_capability('moodle/user:readuserblogs', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+        if (has_capability('moodle/user:readuserblogs', get_context_instance(CONTEXT_SYSTEM))) {
             $permissionsql = '';
         } else if ($filtertype=='user' && has_capability('moodle/user:readuserblogs', get_context_instance(CONTEXT_USER, $filterselect))) {
             $permissionsql = '';

diff --git a/blog/preferences.php b/blog/preferences.php
index ee0017cf1e85f56b20be0387b0ac5cfed71e9bd1..0ab87bdb1400db0407f0f97fae9d9645a660424a 100755 (executable)
--- a/blog/preferences.php
+++ b/blog/preferences.php
@@ -8,7 +8,7 @@
 
     if ($courseid == SITEID) {
         require_login();
-        $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
+        $context = get_context_instance(CONTEXT_SYSTEM);
     } else {
         require_login($courseid);
         $context = get_context_instance(CONTEXT_COURSE, $courseid);

diff --git a/calendar/lib.php b/calendar/lib.php
index c12b9546614ba35ffa5ab011b2b43d6dbf6d7f61..58524751a7a0e64d88b03db8c1e841235a0c12ee 100644 (file)
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -1416,7 +1416,7 @@ function calendar_get_default_courses($ignoreref = false) {
     }
 
     $courses = array();
-    if (has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+    if (has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM))) {
         if (!empty($CFG->calendar_adminseesall)) {
             $courses = get_records_sql('SELECT id, 1 FROM '.$CFG->prefix.'course');
             return $courses;